This very thing is in the FREEDOM Act text. They move collections to private holders (this is what they originally claimed was the case anyway). The surveillance hasn't stopped. There's simply a different legal process for getting records now (now - if the bill passes).