Revert "Add KEYSTORE_MESSAGE_SIZE"

This reverts commit 252a1f1cd3a0512a7772525f54608532106a7d21.