Revert "Merge branch 'aws-integration' into 'master'"

This reverts commit 6fac940d, reversing
changes made to f8d32d07.
2 jobs for !202 with fix-tests in 60 minutes and 1 second (queued for 1 second)
latest merge request