Fix Paul being a meany and squashing my commits