Revert "Manually cherry-pick http://review.cyanogenmod.org/#/c/25104/"

This reverts commit d288b59d65e38db61d4f42574729423a13469d9e.

oops :P