Implement the changes to make use of saltstack/salt#4530