This is part of a patch series to standardize our Salt installations.