Removed parentPath and homePath changes from unrelated branch.