Backed out changeset c15cacb7efd6 (bug 941725) because of test failures