No. There are some other discussions here about how the "conforming amendments" in the new law told us not to change those.
