Backed out changeset b83bf0fa7adc (bug 924724)