Removed use of constant __IPHONE_7_0 so that this will work in XCode 4.
Added back in removeObserver code so that we don't leak observers.