Revert "Bring up to date with CM"

This reverts commit 7e66c5b1acf8e7cadbf0514e91cd38552be9093a.