Events have shown that nobody can be trusted to rein this power in, so nobody should have it. Not a President, not any Congress.
Congress needs to repeal both of the PATRIOT and Homeland Security Acts. Any Congress member that equivocates on this point is just too in love with power to see why this is bad.