(cherry picked from commit 409e1dd1e9)
409e1dd1e9
Still seems to fail because hw/xquartz has too long filenames