No ticket: Fix XHTML regression (1.x)

1.x equivilant to gh-1375.