Revert "Squash commits from CM"

This reverts commit 0a4f98ff14b946658e2bf3f5d376d3082492e883.