Revert "Merge pull request #2 from vixin/cm-10.1"

This reverts commit 9a8171eb8276f258e273466057d27a9655bed783, reversing
changes made to dd65852f7af46ea582697f5579433cd3f99fc174.