Revert "Merge remote-tracking branch 'origin/ios7' into Mobilise-Media"

This reverts commit d84af176656f3ece707b886f3d3d497cdc859664, reversing
changes made to 217d51322598f87622b88f753bc14269fa7c64e9.