Revert "Updating return commands for exit commands"

This reverts commit d0f344ce60df7574072532ea4471dee524ccb88d.