Backed out changeset f8b29993a76c (bug 1089771) for breaking desktop mochitests.