Revert "keymaster for nakasi."

This reverts commit 7ec9bfbe5056fd48face11891f0f30448c010e80.
13 files changed