Revert "More for AOKP"

This reverts commit cff6908b95565e0b1c985342456f9ddbbdd67297.