Backout on removal of wait-for-environment