Revert "Merge branch 'sgt7/cm-11.0'"

This reverts commit 530a9f91357202d894cb3f00561aacab14d06d1c, reversing
changes made to 7e53f90cc7f995cfbc99e938e3f8d03019a7362a.