Revert https://svnweb.freebsd.org/changeset/base/354708

I used the wrong Differential Revision, so back it out and do it right
in a follow-up commit.