Backed out changeset 7e0356305566 (bug 894811)