Belatedly revert r303119, which was determined to not be needed.
Sponsored by: The FreeBSD Foundation