Revert "changes from cm"

This reverts commit b14cf6ab11b03c739e95f8785662116cc0b70b3f.