I believe the wrapper is all but necessary to get the desired styling, and is present on the legacy system.  I can't really see it causing an issue with rendering the content for PDFs either, unless I'm missing something.  Either way, shouldn't this be a separate PR (which it already is)?