Back out rev 1.31 which was never run past me, and which breaks the building
of the port.