Revert "path fixes"

This reverts commit f679d9cb95754ac55c7bc40830987d73b7574967.
path fixes