President Trump has promised a top Senate Republican that he will support congressional efforts to protect states that have legalized marijuana – defusing a months-long standoff between Sen. Cory Gardner and the administration over Justice Department nominees.

In January, the Colorado Republican said he would block all DOJ nominations after Attorney General Jeff Sessions issued a memo that heightened the prospect of a federal marijuana crackdown in states that had legalized the substance. Gardner’s home state made recreational marijuana legal in 2014.

In a phone call late Wednesday, Trump told Gardner that despite the DOJ memo, the marijuana industry in Colorado will not be targeted, the senator said in a statement Friday. Satisfied, the first-term senator is now backing down from his nominee blockade.

“Since the campaign, President Trump has consistently supported states’ rights to decide for themselves how best to approach marijuana,” Gardner said Friday. “Late Wednesday, I received a commitment from the President that the Department of Justice’s rescission of the Cole memo will not impact Colorado’s legal marijuana industry.”

He added: “Furthermore, President Trump has assured me that he will support a federalism-based legislative solution to fix this states’ rights issue once and for all. Because of these commitments, I have informed the Administration that I will be lifting my remaining holds on Department of Justice nominees.”

Especially infuriating, from Gardner’s perspective, was that Sessions had pledged during his confirmation process for attorney general he would leave states that had legalized marijuana alone, according to the senator.

The January memo from Sessions stated prosecutors should use their discretion in weighing whether charges were warranted, rather than abiding by the Obama-era guidance.

Trump has held a sharply different view from Sessions on the issue. During the presidential campaign, Trump said in an interview with KUSA-TV in Colorado that he said “it’s up to the states” on the marijuana issue.

Trump “does respect Colorado’s right to decide for themselves how to best approach this issue,” White House legislative affairs director Marc Short said in an interview Friday.

Gardner held up about 20 Justice nominees, a significant number considering Senate Republicans and the White House have for months accused Democrats of slowing down consideration of other Trump picks.

A bill has not been finalized, but Gardner has been talking quietly with other senators about a legislative fix that would, in effect, make clear the federal government cannot interfere with states that have voted to legalize marijuana.

“My colleagues and I are continuing to work diligently on a bipartisan legislative solution that can pass Congress and head to the President’s desk to deliver on his campaign position,” Gardner said.

In addition to Gardner’s holds, DOJ has faced notable bipartisan pushback from Capitol Hill when it comes to marijuana.

Sens. Orrin G. Hatch (R-Utah) and Kamala D. Harris (D-Calif.) wrote to Sessions this week, urging him to back off efforts to curtail medical marijuana research at the Drug Enforcement Administration. The Washington Post reported in August that Sessions’s DOJ was effectively hamstringing the agency’s research efforts by making it harder to grow marijuana.

Separately, former House Speaker John A. Boehner (R-Ohio) announced this week he is joining the board of directors for a cannabis company and engaged in efforts to allow veterans to access marijuana for medicinal use. He has opposed decriminalizing the substance as an elected official.