Bug #20049: unset the xml switch instead of setting it to false.