Well, no, this is assuming the problem gets fixed and most of the undocumented people living in the US suddenly become eligible.

If a rule is unjust to begin with, I don't see how being fair in its application is all that paramount. Insert any number of parallels to the War on Drugs here.