change to env variables for bypass if needed; unset aws env just to a…

change to env variables for bypass if needed; unset aws env just to a… #31748