Backed out changeset 746018b05d67 (bug 924972) because of test failures