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

This reverts commit f0ff9d1e639215ffc5e3c2549173b64f7c5fd70a, reversing
changes made to b2b5677d5e4bc6bba3368448387550ea432513d4.