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

This reverts commit 738ebc210195261a6317013f9308ea3ac169e455, reversing
changes made to 2b171345d451ec56560758a78ea76ad09c4d1c17.