Restore VMWare support