Revert "Merge pull request #2 from PAC-man/cm-10.2"

This reverts commit 3f1a81217f36495bbb0286e5f5ee267afe275e45, reversing
changes made to 6df5bf273d7ce517d9c0f242779c76b645811fb2.