While simply scrapping the 2018 deal might not be feasible, moving to an altogether new system could be a way forward.