Revert "Follow ivanich's cm-12.0 branch"

This reverts commit 9e22f5679ad378b2b3ad810d928b7cc219fcc58d.