Let the platform do the work

Sugar 25.1