fixup! move wait-till-listening to regular deps