[BUG] Attempt to fix #3505 in the Salt provisioner

I shamelessly copied from https://github.com/mitchellh/vagrant/commit/6c5179602ceb4779a4111790d4a675ecdc01c1ab to try and fix #3505.

Pardon the Magritte joke.