Revert previous fix for PR 45723.