Backed out changeset f87e93861239 (bug 649607) for causing bug 901921