Revert "Merge cm10.2"

This reverts commit b9bdd95eef4ba5dd8a9fa354b2a067b4ed49e5b2.

'Revert'