Revert "Merge remote-tracking branch 'cm/cm-10.1' into db42"

This reverts commit 54f24cc221b1c995107b75ddcd84bc55a1c20ef1.