FS-21 FS-22 Moved SALT_SIZE back