Revert "Multiple edits to bring in line with CM."

This reverts commit c578565789d69f206ca5741232615adae1435dde.