This potentially can be problematic, because we are assuming only retriever one can be active at a time. Leave it for this pull, but we'll need to address multiple ones being active at the same time.