Backed out 2 changesets (bug 967325) for rc4 failures

Backed out changeset 5db7e8e8bd6c (bug 967325)
Backed out changeset bbd7ca6452ff (bug 967325)