I don't think it's going anywhere unfortunately. I hope, and I think this is the best chance we're going to get but I think it's going to flop.
I think the closest we're going to get is removing the tax. MAYBE have them go something like a Form 4473 AFTER you submit photo and fingerprints. That way they're still getting all the info from you that they want, and they stay on the registry.