Revert "Adjustments to play nicely and remove warnings in iOS 6.0."

This reverts commit 930fd5e4d7abded2731334b32b4048c4f47ca0ec.