Revert changes from main commits that were merged into blender-v4.1-release

The last good commit was f57e4c5b98.

After this one more fix was committed, this one is preserved as well:
67bd678887.

scripts/modules/bpy/utils/__init__.py

@@ -21,8 +21,6 @@ __all__ = (
     "refresh_script_paths",
     "app_template_paths",
     "register_class",
-    "register_cli_command",
-    "unregister_cli_command",
     "register_manual_map",
     "unregister_manual_map",
     "register_classes_factory",
@@ -51,11 +49,9 @@ from _bpy import (
     flip_name,
     unescape_identifier,
     register_class,
-    register_cli_command,
     resource_path,
     script_paths as _bpy_script_paths,
     unregister_class,
-    unregister_cli_command,
     user_resource as _user_resource,
     system_resource,
 )

scripts/modules/bpy/utils/toolsystem.py

@@ -2,10 +2,6 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-__all__ = (
-    "ToolDef",
-)
-
 # Until we untangle ToolDef from bl_ui internals,
 # use this module to document ToolDef.
 from bl_ui.space_toolsystem_common import ToolDef