Backed out changeset 8ecb68f17618 (bug 909129) for causing bug 924959