BUG/RVRT: Undo changes to load environment