Revert "Merge pull request #4 from TheMuppets/cm-10.1"

This reverts commit 29a56302d4d5d0f632da088dfc09f9b3f792c575, reversing
changes made to 4a321a7a416aee1708968648d33d0824c69af1ae.