Revert

4 jobs for !273 with aws-cherry-pick-release/0.16 in 10 minutes and 21 seconds (queued for 3 seconds)
latest merge request