Fix for PR c/57490.