Well wont USCIS 2004 document account for such a change, then. I think till someone can prove it otherwise with a valid reference, This issue is very much open for debate.
The 2004 USCIS "document" is a summary report. It's not binding on anyone. Footnote 200 cites a manual and a textbook - neither of those are legally binding. The sections cited for the repeal are from the statute (to be technical, an act that amends the Immigration and Naturalization Act, "INA"). Statute is legally binding.