Backed out changeset ba9c8fcf76e6 (bug 933300)