Revert "More path updates"

This reverts commit 3ffcdc15bdb4a3d1a1a216d58f881b2022343738.