Update:

Threats to privacy in proposed new intercept rules averted, says EFA

Looks like that's a bullet dodged.