For #1920: don't default to `application/xml` too early