That isn't a sufficient solution. These spying programs are the beginnings of totalitarism. They have to be repealed.
P.S. Intended to be brutal, think about it.
I should probably be keeping my mouth shut regarding my opinions on US politics, since I'm visiting in a few months. Would be embarrassing to be confronted with this stuff at the border.