The current one big bill does a 5 year reversion back to the old rules, and then goes back to the problem existing. So it is the same idea as the 2017 bill.

See https://exactera.com/resources/what-one-big-beautiful-bill-a... for details. I will warn you, though, that the provisions are complicated enough that it is hard to read the article.

The problem is that we don't know whether this will get fixed in that time frame. Also that big bill introduces its own problems. A future Congress with debt financing problems may not realistically have the freedom to revert terms such as this one.