* commit 'aea7b6903b66b07f35369c8b16b7a7df503022c7': Revert "Check non-primary user dirs during package scan"