Backed out changeset 13ba124946bd (bug 1074378) for causing bug 1081171.