Backed out changeset 3caf91fee477 (bug 836515) for test failures. a=orange