Adding back some missing code

21 jobs for aws-integration in 44 minutes and 6 seconds (queued for 19 seconds)