Use same code path for iOS as for OS X here, too

Again, no visible effect, which is both good (yay, convergence) and
sad (sigh, doesn't fix the problems)...

Change-Id: Ica010df4f115a7d47b25dea3613fb9f4b5f6a9ff