Previous commit should have gone to #6634.