Revert "Merge pull request #10 from iiD4x/cm-11.0"

This reverts commit 61259e5dae657a6a72a451d8548870d4cd4ec2ce, reversing
changes made to 7c8e2d9f755474d29eb50b1c255c1977ee500cc0.