Backed out changeset 5b8f52a76065 (bug 1050660) due to mochitest-2 failure on Linux