Backed out changesets ed1ef43ce9af, 3d2b3f7eac93, and 8fc6d7d32482 (bug 827831) for Marionette failures.