Properly commit the revert of r343205.
MFCing the head revert isn't the same as reverting the MFC.
This is a direct commit to stable/12.