Revert "Removing some of the changes to how keys are setup"

This reverts commit 053e79a90b5d2601fbedb9550944c57e0e135258.