Revert "Merge CM tree changes"

This reverts commit 0f41a8e66b4dff9f2549f9a312c8f3b1168ae623.