Fix for iOS 8 rotation.  Not pretty, but works.