Revert part of r371544


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@371623 35697150-7ecd-e111-bb59-0022644237b5
Revert part of r371277


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@371624 35697150-7ecd-e111-bb59-0022644237b5