kill all the unicorns (switch to CM)

Change-Id: I47f764d9363afc9a137d7afbfc90a55655e4f555