This reverts commit 3a8cbea4f7. This breaks systemd; We need to apply the systemd upgrade first.
3a8cbea4f7
infixSalt
suffixSalt