Backed out changeset a6ecd3131b8a (bug 1037128)
Backed out changeset 6ac0f97c0c09 (bug 1037030)