Move salt pull request to its own branch for further work

This reverts commit 85f134174881c87ff08be3252c351ddfba8954c8, reversing
changes made to 29cfea52f1feff5436e559cd559552d26c8ed993.