Disable http://review.cyanogenmod.org/#/c/50449/ for now