Backed out changeset b60084fa9d5b (bug 938809)
Backed out changeset d77f989d6e7d (bug 938809) for bustage