Regression in df41b5a05d4e00e80e73afe629072e37873e767a. Backport of 01384ce36c3fddfbcc5af6e1108bdb8cd3e9389d from master
Thanks Aymeric Augustin for shepherding the DEP and patch review. Thanks Marten Kenbeek and Tim Graham for contributing to the code. Thanks Tom Christie, Shai Berger, and Tim Graham for the docs.