Ensure the rhost datastore option is restored