Revert "Merge pull request #1080 from Gozala/hotfix/path" for breaking everything on the Jetpack tree, but mysteriously working on try...

This reverts commit 398f7e7e6afea2194dafa440dac0178744f0b7ca, reversing
changes made to c01d686b17ed1d182f1f5256b8b6e8730d89171b.