This changeset reverts "labs: temporary wbatch fix" and replaces it with a proper fix, allowing the creation of correct Windows batch files on build hosts without VirtualBox. Change-Id: Iad005ce9f0dcecb910fc09b2c43385dd42992eda