Revert "Merge pull request #504 from aglover/ASGARD-1288"

This reverts commit f44f8758cb2719906f9647f171cffe8178eff0b3, reversing
changes made to 5d3864311c900a889f586cd08e6c10a27ce0b003.
Merge pull request #516 from claymccoy/revertingConflictingModificationsToAutoDeploy

Revert "Merge pull request #504 from aglover/ASGARD-1288"