https://reclaimthenet.org/the-nsa-wants-congress-to-allow-purchase-of-warrantless-data Of course the NSA would want to keep that loophole open.
As lovely as national security is, I don't think mass surveillance of literally everyone is proportionate for it, and it's left the door open to all kinds of abuses.