Revert "Manual merge of review.cyanogenmod.org/#/c/27689/1"

This reverts commit 7060b5c44c4f0287c722c3ba18aaf2ddf2bafea7.