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

This reverts commit 75661bb3c3e761b433b7e40de079658a7470e449, reversing
changes made to c0514b0362129c73d5f595083e9a62724bacefc1.