Revert "Cosmetic changes to include search path"

This reverts commit 5e5065e35a0f07b91264e382536aa00e619208ee.