Ref #3442 Fixes #3470: make obvious dependency to default wf impl