Un-bitrot from switch to 32-bit key bits