Unfortunately this is probably going to be the most effective restraint on state-sponsored surveillance. Whereas it would be great if there was some technical solution, better if there was a political solution and perfect if ethics and constitutional law triumphed, hitting the US Government in it's wallet will probably have the greatest impact.