Revert "Follow ivanich's cm-12.0 branch"

This reverts commit 692689844e031883d74b93e7122c0e346e172dfc.