Revert to changeset 4c45dbd81a32 to fix mochitest-chrome orange.