Revert "Don't duplicate shims in PATH"

This reverts commit 03fa148e814d50aba8012dc94b866213a00ea8a9.