My 2 cents: I think the adaptive version here is better than the previously introduced setting. If at all, we could keep the setting from #2140 but unset by default and it would overwrite the adaptive with if set. Though I don't think it's necessary because I guess (but it's really just a guess) that this implementation will suffice for most users.
So to make it short: replace #2140 with this one.