Fix environment syncing so that it will still not stop, and so that when you stop the agent, it reverts it (so we can update, or try to, on-the-fly)