Restored master to pre-newvm state so i can work on other stuff