MFC r354520:
Get the fix in back by reverting the part accidentally included in r354491.
This brings back r354467.
Sponsored by: The FreeBSD Foundation