Rolled back iPhone non-fix.
iPhone fix: padding reduction.
Merge remote-tracking branch 'origin/master'