Bug 1043023 - backout mock env change until golden AMI are regenerated