Backed out changeset 72f85a52a2ca (bug 1047594) for causing bug 1050063