Revert "Make the WiX dirs unique"

This reverts commit e0b992fdc03bb8cf68cde4e774754dfaf5123bdf.