Re-do feature/CC-221

Un-reverts control-center/serviced#1132