undo non v-08 changes to the master