Change things back old-skool so we can build ios 5