Reverted to looking at PACKAGE_DIRS