Merge "Revert "Prevent side channel package installation enumeration""