This reverts commit 7360a0f70f. iOS still wants this sometimes. Probably best to revert for now and we can always remove this again later. See: https://meta.discourse.org/t/189799/11?u=blake
7360a0f70f