I don't think the wrapper is needed any more.