We now don't using XHTML by default