Backed out changeset e02e1b107db7 (bug 919676) for causing bug 924129.