Revert "Trying the non-cm branch"

This reverts commit a87e8da2609621c11ef8072e4b5f10fff363f8c4.