There is a bill that would do just that. Passed the house but then couldn't get past the filibuster even though it had 52 senate votes.
This situation does not lend itself to pat answers, including why Team Pelosi didn't first try a bill with both provisions combined. This trainwreck (sorry) could be seen coming for weeks, there was plenty of time to try to do the right thing. Except of course for both parties' establishments hating this segment of the population.