* Rollback commits to get iOS into a stable state
This rolls back the following commits:
* 23c52fc (#6434)
* a97cf4b (#6433)
* e72e174 (#6428)
It also updates the engine to a newer revision that has the
necessary rollbacks in the engine repo.
Fixes#6458