Revert "Forward compatibility fix"

This reverts commit 5ed2ae18864d0c58ae8811586928f2d43c5b697a.
Merge branch 'jb3-aosp' of github.com:LiquidSmooth/android_frameworks_base into jb3-aosp