Backout Bug 983347 - Need different paths for displaying to the screen and sending over the wire. Obsolete patch committed.

--HG--
extra : amend_source : 626b92ae82330a77ee894bf46bc609586e3381d3
Bug 983347 - Need different paths for displaying to the screen and sending over the wire. Correct version. r=florian,clokep a=jcranmer

--HG--
extra : amend_source : ed5630c8c2d6d7a3c0d9b8b726ee69126541d2bd