Revert "simplify basket_with_uid_path handling". It broke more
things than what it’s worth.

This reverts commit 37941e16d056d3a3e481d322bab57d073d3e48a0.
fix 37941e16d056d3a3e481d322bab57d073d3e48a0 differently