This work is necessary in order to onboard with AWS SDK v2. Once done, most of our code can move over to the new SDK.