Revert "Revert "Revert "More reliable version of loggregator CATs"""

This reverts commit e25425e77e5952b58d63a0bfd730a34479dd003e.

Conflicts:
	helpers/app_commands.go