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

This reverts merge request !425
9 jobs for revert-4b8f558b in 15 minutes and 5 seconds (queued for 2 seconds)