Revert "CM11 patch"

This reverts commit b8c635efb35ae11b6ecfa1709ed52e846f2d7f77.