This MR fixes a bug in my fix to #24083.
See Note [Disconnected type variables].
Note [Disconnected type variables]