New patch by Deependra that sets AWS as default behavior