Fix a mismatch in generated GUIDs on non-Windows platforms by