Merge "Revert "Fix VM-less builds.""