Reverted most code copied from EntityBoat