Squash into f3c5efc and fix comment since we added
CODE_ENVIRONMENT_UTILITY_NODOUT instead of changing the default
behavior