This reverts commit 6dff63294a8bd264c8b93f89c721022de2abb072. We have a more general fix now, so don't need this any more.
infixSalt
suffixSalt