Backed out changeset 5184f19384c8 (bug 1049434)