Follow up to the revert in e560459c5b. This reverts commit 1936b11f63.
e560459c5b
1936b11f63
infixSalt
suffixSalt