Revert part of 933fa23, this would not work properly if get_all_assistants was called repeatedly with different sub_dirs