Backed out changeset 36a2061cff79 (bug 863306)