Second unreviewed build fix for r95941