Revert "Merge branch 'vagrantupgrade2' into test"

This reverts commit f1428cd50d94ee06d1d28325fb69e0159d0d2d57, reversing
changes made to bb308c7bdf356eab458733eee5d1322fea9c5a14.