Revert "Merge remote-tracking branch 'cm/cm-10.2' into dc43"

This reverts commit 0760bacee0fd40296feb873a29934f6d04b25fa9, reversing
changes made to 255f8a4fafe01de65bc4067c203f3658ca18fcbb.