Revert r312404 as we need to do an exp-run and fix existing ports that
rely on the previous behavior.

Requested by: antonie (portmgr)