Revert http://review.cyanogenmod.org/#/c/30269/