Revert "Change to CM11... hopefully"

This reverts commit 0cd11a8e5cc0a143853eb0a9f7a878c06966cac0.