There is a way to once and for all prevent this.

More IT people in politics.

The mass-surveillance proponents will always exist in small numbers, but it gets revived every other month because the number of ignorant politicians receptive to the idea is a function of their ignorance and malformed understanding of reality.

But that isn't their fault.

It's the magic tech companies are selling - and it's knowledgeable individuals who have to effectively communicate and explain bullshit.