Bug 1021734 - Remove special handling for marionette-transport, r=wlach