Revert "fixes CC-221"

Reverts control-center/serviced#1132