Previous commit should have gone to #7640.