Reapply r68191.
1 file changed