Revert "Set the entire thing in an else statement?"

This reverts commit ae465a34bf9d7e007349e387df265c6a62370c54.