Permanently stopping those proposals wouldn't necessarily eliminate illegal, back-door mass government surveillance, nor would it eliminate private sector mass

Permanently stopping those proposals wouldn't necessarily eliminate illegal, back-door mass government surveillance, nor would it eliminate private sector mass surveillance (think social media) which then gets accessed by the government (whether legally or not). Fighting corruption only works when enough people fight it at enough levels, and continue to fight it. There is no getting around the fact that the price of freedom is eternal vigilance.