Revert "Merge pull request #98 from BrianEWhipple/knife-358-bootstrap-wh...

...en-vm-available"

Will merge this from a different branch

This reverts commit 6feef86e2b99e73f40badab985869e37f361559d, reversing
changes made to de9b3adbd480088e720ade978a7ee9763dab810e.