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