Cleaner WaitForEnvironment (we think so)

--HG--
extra : amend_source : 6bb3a198e47936664a33e90cb70d2f077cf435b7