I am in the camp now, that these surveillance abilities as applied to US citizens ought to be completely removed. Will it mean more terrorism? Perhaps. But I would rather deal with the terrorism attacks than continue unabated down the road of a Police State surveillance-wise that rivals East Germany during the cold war.
Yes. 100%.