Revert a few more to cm11

Change-Id: I7d4c2593ad5dfa2ac73722a8bde432904eea50d0