Move back to CM

- Faster Upstream + Sparse mnazim ;)
- Revert "Update dependencies"

This reverts commit 0d45b1938a6246008b2140d9b6f276d499da4ccd.

Change-Id: I3164d91c180aad16451175eff09f94000a946fd2