Backed out changeset 93840f9b5af8 (bug 909434) for causing five new bugs.