Reapply b09907085

This fix was accidentally undone when I upgraded xnu to 2422.90.20.