Merge pull request #1744 from CircleCI-Public/rollback-comm