partial revert of:
https://github.com/DerTeufel/android_frameworks_base/commit/d4bb3bc99c6ba13f7fd7738926aba3e6524d1419

Change-Id: I2c924a8679cc7512f998d9760ebe77e8cc96259f