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

This reverts commit 5181a378d874f9249e1e704c2fc8c98fba6f004f, reversing
changes made to ad705028373b82bf73d05f640b096c3f874c00bd.