This reverts commit 4e6eae45ee. It breaks running the test driver interactively (in that it causes all VMs to be started immediately, which is not always what you wnat).
4e6eae45ee
Should allow merging #1816