Created by: dadlerj
This reverts commit 890ad0626b710fb598a0e8709a030fae59e3a077 as it caused the WAU request to take more than 60s to finish on k8s and thus 504s.
Is a revert