Revert "Clean up code branch for --no-key vs. --key"
Revert "Clean up code branch for --no-key vs. --key"

This reverts commit 73f6c1bf0e9a19e01afd117d62024b863e38eae6.

flovilmart/Carthage,flovilmart/Carthage,0xced/Carthage,NachoSoto/Carthage,erichoracek/Carthage,erichoracek/Carthage,erichoracek/Carthage,abbeycode/Carthage,abbeycode/Carthage,abbeycode/Carthage,flovilmart/Carthage,abbeycode/Carthage,NachoSoto/Carthage,NachoSoto/Carthage,erichoracek/Carthage,0xced/Carthage,0xced/Carthage