I think it would be easier to wait for the handle change, which doesn't seem to be coming