This reverts commit 7ce0e10fbc, reversing changes made to 29ba71f2db. This was reverted because it seemed to be related to an issue when doing a DeployDC, causing an `addHost` error.
7ce0e10fbc
29ba71f2db