Backed out changeset 80f873bf8adc (bug 1036682) for test bustage