Change files-in-packages-directory check to something that should actually work...