Remove merged patch: http://review.cyanogenmod.org/#/c/48770/