56c1c26e75
This reverts commit a0160c0ae8.
The original issue was a result of a libxml2 regression that has since
been fixed.