Revert "Follow ivanich's cm-12.0 branch"

This reverts commit 02f32a3a5babb31778f5af98c194d0ca9f2246f6.