Revert "Merge branch 'cm-10.1'"

This reverts commit 5cf6b1b1dc3943baca62511c8407157619b3eec3, reversing
changes made to 0e5c8bda32529f45c2bc2e0a59c5f115c4239c4d.