This reverts commit 9f970f28b1, reversing changes made to 6d0c92be72. This was reverted because it seemed to be related to an issue when doing a DeployDC, causing an `addHost` error.
9f970f28b1
6d0c92be72