manually fixed (?) some messed up commit undos