Revert "Merge pull request #477 from twitter/feature/ianoc_frozen_keys"

This reverts commit 6d6606595aa285accccb206c4fbbac947d1852cb, reversing
changes made to 5eebe7719e136c0fa8ee091c049a4d5fc0b53485.