Revert env moving stuffs