change set_return_on_destroy tool to take a fshandle