Undo horrible breakage. (This might undo some other chnages, sorry.)