Revert "Framework: Port CM9 features to CM10"

This reverts commit d6b96f2350fc4a7150fc90b29eec2c4482d13f6e.