Backed out changeset 53e23b1b3642 (bug 1092450) for test bustage