This commit had to be reverted for PR 281125: https://cgit.freebsd.org/src/commit/?id=89e73359424 The problems ostensibly fixed by that commit are still here, so this PR serves to track them.