This reverts commit 60c98baf17. The original issue was a result of a libxml2 regression that has since been fixed.
60c98baf17