MFH r266813: Don't break the legacy applications which set
just 2 bytes to salt.