MFH: r398428
Backout r398328 and r398370, they break packages depending on them.
With hat: portmgr Sponsored by: Absolight, The FreeBSD Foundation