Merge pull request #15 from chrmhoffmann/cm-11.0

Cm 11.0
Revert "Merge pull request #15 from chrmhoffmann/cm-11.0"

This reverts commit 4d6433868b55155c8741e74417a31326ebf04eb3, reversing
changes made to 1a38090ef89d13d407c6bf8fc6a54baab93cabac.