I believe the discussion in #8634 is for a different change, but one of a similar nature.