Revert r354238 as the issue has been fixed in r354418
PR: 241562 Sponsored by: The FreeBSD Foundation