Backed out changeset 40d6ccba44f1 (bug 1045973)