Revert r325365

r325365 caused several ports to fail to patch correctly. Revert it for the
time being until an exp-run can be completed.

Requested by: antoine
Approved by: emaste (implicit)