Backed out changeset 8e754efd35cd (bug 994912)
Backed out changeset 23b18c4d6f6a (bug 994912) for suspecion of causing m3 test failures