diff --git a/archivebox/core/admin.py b/archivebox/core/admin.py
index e2104e83..c4974c3a 100644
--- a/archivebox/core/admin.py
+++ b/archivebox/core/admin.py
@@ -48,25 +48,25 @@ class TagInline(admin.TabularInline):
 from django.contrib.admin.helpers import ActionForm
 from django.contrib.admin.widgets import AutocompleteSelectMultiple
 
-# WIP: commented out because broken by Django 3.1.2 -> 4.0 migration
-# class AutocompleteTags:
-#     model = Tag
-#     search_fields = ['name']
-#     name = 'tags'
+# WIP: broken by Django 3.1.2 -> 4.0 migration
+class AutocompleteTags:
+    model = Tag
+    search_fields = ['name']
+    name = 'tags'
 
-# class AutocompleteTagsAdminStub:
-#     name = 'admin'
+class AutocompleteTagsAdminStub:
+    name = 'admin'
 
 
 class SnapshotActionForm(ActionForm):
     tags = forms.ModelMultipleChoiceField(
         queryset=Tag.objects.all(),
         required=False,
-        # WIP: commented out because broken by Django 3.1.2 -> 4.0 migration
-        # widget=AutocompleteSelectMultiple(
-        #     # AutocompleteTags(),
-        #     # AutocompleteTagsAdminStub(),
-        # ),
+        # WIP: broken by Django 3.1.2 -> 4.0 migration
+        widget=AutocompleteSelectMultiple(
+            AutocompleteTags(),
+            AutocompleteTagsAdminStub(),
+        ),
     )
 
     # TODO: allow selecting actions for specific extractors? is this useful?
diff --git a/archivebox/core/apps.py b/archivebox/core/apps.py
index 21b95877..b1150eb9 100644
--- a/archivebox/core/apps.py
+++ b/archivebox/core/apps.py
@@ -3,4 +3,5 @@ from django.apps import AppConfig
 
 class CoreConfig(AppConfig):
     name = 'core'
-    # default_auto_field = 'django.db.models.UUIDField'
+    # WIP: broken by Django 3.1.2 -> 4.0 migration
+    default_auto_field = 'django.db.models.UUIDField'
diff --git a/archivebox/core/settings.py b/archivebox/core/settings.py
index 6a52641d..0485c3c4 100644
--- a/archivebox/core/settings.py
+++ b/archivebox/core/settings.py
@@ -268,8 +268,8 @@ AUTH_PASSWORD_VALIDATORS = [
     {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'},
 ]
 
-# WIP: commented out because broken by Django 3.1.2 -> 4.0 migration
-# DEFAULT_AUTO_FIELD = 'django.db.models.UUIDField'
+# WIP: broken by Django 3.1.2 -> 4.0 migration
+DEFAULT_AUTO_FIELD = 'django.db.models.UUIDField'
 
 ################################################################################
 ### Shell Settings