Revert "fixes CC-221"
Merge pull request #1133 from control-center/revert-1132-feature/CC-221

Revert "fixes CC-221"