Revert "CM11 Patch"

This reverts commit 25a28c9cadc8a1e73343ec948f6f739121a00b1f.
Revert "Include: CM11 Patch"

This reverts commit 8407ba060cd840fe3c37d987fb47b27082401e41.