Backed out changesets 94c5f5317e4b, f43962d6b41e, and 6e0a13090cd8 (bug 1074736) for various carat-related Marionette failures.

--HG--
extra : rebase_source : e26c24158df6cc8198ca57f505028a1f82aa7264