Removing some of the changes to how keys are setup