Revert commit: 8a6b888f90d6ab8467d6c72aa1a944b296b393e6

Revert commit: 8a6b888f90d6ab8467d6c72aa1a944b296b393e6
(https://github.com/AOKP/frameworks_base/commit/8a6b888f90d6ab8467d6c72aa1a944b296b393e6)