Revert "Framework: Port CM9 features to CM10"

This reverts commit ae8dc5a711e418c332a6034d9674a00352e7df9b.