Revert some iOS changes that fail to compile against older SDKs