This reverts commit 23040785. The new flag doesn't work and the change even broke the XML_PARSE_NONET option.