Revert "Path 2.0"

This reverts commit bf52dc772c5842607f2039cd7ec2023800d8eae8.