These should not be needed anymore, at least after the recent port
removals.  So let's see whether we can do without them.