MFC r279812:
Remove some particularly bad code; no functional changes.
MFC r279815:
Erm, revert chunk committed by mistake.
Sponsored by: The FreeBSD Foundation