Redo some commits after messing up the old commits