This breaks the workaround used for Star Wars: Rouge Leader, but that problem has gotten a more proper solution in 4.0-4889.