A Wall Street Journal editorial proposes taking juridiction from State to Justice:
The only real way to end this “never-ending conversation” is by shifting this portfolio from State to the Justice Department, which presumably would take a more aggressive approach to affronts to U.S. law and sovereignty.