Reverse ASGARD-1273 more ASGs

The unit tests do not pass (they time out) with the code changes from https://github.com/Netflix/asgard/pull/478 so I need to back out those changes in order to get the tests passing right away. Debugging these changes will take too long, since I need master stable right away in order to merge and deploy time-sensitive change tonight.