r6193: we don't need to store the handle type here,