The defeat of the USA Freedom Act could, ironically, backfire and abolish part of the PAT RIOT act, reducing mass surveillance even more.

However, we need more than just to abolish the PAT RIOT Act, since that pertains only to certain methods of massive surveillance.

http://gnu.org/philosophy/surveillance-vs-democracy.html.