This is to make the diff when stabilizing it easier to review.
Updates THIR behavior to match the changes from #93678