Bug 983347 - Need different paths for displaying to the screen and sending over the wire. r=florian,clokep a=jcranmer

--HG--
extra : amend_source : b1d4b4cba332f4c9a37913dce0fd6dac9cc7fb80