diff --git a/analytics/migrations/0009_remove_messages_to_stream_stat.py b/analytics/migrations/0009_remove_messages_to_stream_stat.py
index 98c032ce21..2a0c412e11 100644
--- a/analytics/migrations/0009_remove_messages_to_stream_stat.py
+++ b/analytics/migrations/0009_remove_messages_to_stream_stat.py
@@ -1,5 +1,5 @@
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/analytics/migrations/0010_clear_messages_sent_values.py b/analytics/migrations/0010_clear_messages_sent_values.py
index 340a639944..b1bd03e543 100644
--- a/analytics/migrations/0010_clear_messages_sent_values.py
+++ b/analytics/migrations/0010_clear_messages_sent_values.py
@@ -1,5 +1,5 @@
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/analytics/migrations/0011_clear_analytics_tables.py b/analytics/migrations/0011_clear_analytics_tables.py
index fe4e2f0fd8..d7b69ce53e 100644
--- a/analytics/migrations/0011_clear_analytics_tables.py
+++ b/analytics/migrations/0011_clear_analytics_tables.py
@@ -1,5 +1,5 @@
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/analytics/migrations/0015_clear_duplicate_counts.py b/analytics/migrations/0015_clear_duplicate_counts.py
index 2e78a1df35..b97f8265fa 100644
--- a/analytics/migrations/0015_clear_duplicate_counts.py
+++ b/analytics/migrations/0015_clear_duplicate_counts.py
@@ -1,5 +1,5 @@
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 from django.db.models import Count, Sum
 
diff --git a/pgroonga/migrations/0002_html_escape_subject.py b/pgroonga/migrations/0002_html_escape_subject.py
index 9791451456..b8c8d9b82b 100644
--- a/pgroonga/migrations/0002_html_escape_subject.py
+++ b/pgroonga/migrations/0002_html_escape_subject.py
@@ -1,5 +1,5 @@
 from django.db import connection, migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 from zerver.lib.migrate import do_batch_update
diff --git a/zerver/migrations/0001_initial.py b/zerver/migrations/0001_initial.py
index dffc288083..ae311cd8c0 100644
--- a/zerver/migrations/0001_initial.py
+++ b/zerver/migrations/0001_initial.py
@@ -6,7 +6,7 @@ import django.db.models.deletion
 import django.utils.timezone
 from django.conf import settings
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 import zerver.models
diff --git a/zerver/migrations/0029_realm_subdomain.py b/zerver/migrations/0029_realm_subdomain.py
index 69a0fb2832..8cec0aab9f 100644
--- a/zerver/migrations/0029_realm_subdomain.py
+++ b/zerver/migrations/0029_realm_subdomain.py
@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0032_verify_all_medium_avatar_images.py b/zerver/migrations/0032_verify_all_medium_avatar_images.py
index 1dceada9c9..e0d5c2b500 100644
--- a/zerver/migrations/0032_verify_all_medium_avatar_images.py
+++ b/zerver/migrations/0032_verify_all_medium_avatar_images.py
@@ -3,7 +3,7 @@ from typing import Text
 
 from django.conf import settings
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 from mock import patch
 
diff --git a/zerver/migrations/0033_migrate_domain_to_realmalias.py b/zerver/migrations/0033_migrate_domain_to_realmalias.py
index d9c3dafcb4..4abf8acd91 100644
--- a/zerver/migrations/0033_migrate_domain_to_realmalias.py
+++ b/zerver/migrations/0033_migrate_domain_to_realmalias.py
@@ -1,5 +1,5 @@
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0037_disallow_null_string_id.py b/zerver/migrations/0037_disallow_null_string_id.py
index ae5b2c3b86..e6af1ee441 100644
--- a/zerver/migrations/0037_disallow_null_string_id.py
+++ b/zerver/migrations/0037_disallow_null_string_id.py
@@ -1,5 +1,5 @@
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 from django.db.utils import IntegrityError
 
diff --git a/zerver/migrations/0041_create_attachments_for_old_messages.py b/zerver/migrations/0041_create_attachments_for_old_messages.py
index 002a8e4a81..3d23775717 100644
--- a/zerver/migrations/0041_create_attachments_for_old_messages.py
+++ b/zerver/migrations/0041_create_attachments_for_old_messages.py
@@ -2,7 +2,7 @@ import os
 import re
 
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 attachment_url_re = re.compile(r'[/\-]user[\-_]uploads[/\.-].*?(?=[ )]|\Z)')
diff --git a/zerver/migrations/0057_realmauditlog.py b/zerver/migrations/0057_realmauditlog.py
index dbbb156c63..39a899378e 100644
--- a/zerver/migrations/0057_realmauditlog.py
+++ b/zerver/migrations/0057_realmauditlog.py
@@ -2,7 +2,7 @@
 import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 from django.utils.timezone import now as timezone_now
 
diff --git a/zerver/migrations/0074_fix_duplicate_attachments.py b/zerver/migrations/0074_fix_duplicate_attachments.py
index 4e552cd95b..0a6d6d3510 100644
--- a/zerver/migrations/0074_fix_duplicate_attachments.py
+++ b/zerver/migrations/0074_fix_duplicate_attachments.py
@@ -1,6 +1,6 @@
 # Generated by Django 1.10.5 on 2017-04-13 22:12
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 from django.db.models import Count
 
diff --git a/zerver/migrations/0079_remove_old_scheduled_jobs.py b/zerver/migrations/0079_remove_old_scheduled_jobs.py
index 60b1fdb3e8..1f3315657c 100644
--- a/zerver/migrations/0079_remove_old_scheduled_jobs.py
+++ b/zerver/migrations/0079_remove_old_scheduled_jobs.py
@@ -1,6 +1,6 @@
 # Generated by Django 1.10.5 on 2017-05-10 05:59
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0081_make_emoji_lowercase.py b/zerver/migrations/0081_make_emoji_lowercase.py
index 2da3c83600..76fcfaa3ed 100644
--- a/zerver/migrations/0081_make_emoji_lowercase.py
+++ b/zerver/migrations/0081_make_emoji_lowercase.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.10.5 on 2017-05-02 21:44
 import django.core.validators
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0085_fix_bots_with_none_bot_type.py b/zerver/migrations/0085_fix_bots_with_none_bot_type.py
index 2b1ba2fcb7..fa92ecbccc 100644
--- a/zerver/migrations/0085_fix_bots_with_none_bot_type.py
+++ b/zerver/migrations/0085_fix_bots_with_none_bot_type.py
@@ -1,6 +1,6 @@
 # Generated by Django 1.11.2 on 2017-06-20 10:31
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0087_remove_old_scheduled_jobs.py b/zerver/migrations/0087_remove_old_scheduled_jobs.py
index f7febd36d0..8dc226d4ee 100644
--- a/zerver/migrations/0087_remove_old_scheduled_jobs.py
+++ b/zerver/migrations/0087_remove_old_scheduled_jobs.py
@@ -1,6 +1,6 @@
 # Generated by Django 1.10.5 on 2017-05-10 05:59
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0093_subscription_event_log_backfill.py b/zerver/migrations/0093_subscription_event_log_backfill.py
index ae08c429fc..de0b3f290d 100644
--- a/zerver/migrations/0093_subscription_event_log_backfill.py
+++ b/zerver/migrations/0093_subscription_event_log_backfill.py
@@ -1,5 +1,5 @@
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 from django.db.models import Max
 from django.utils.timezone import now as timezone_now
diff --git a/zerver/migrations/0097_reactions_emoji_code.py b/zerver/migrations/0097_reactions_emoji_code.py
index 47bdf02d65..cebef0bb73 100644
--- a/zerver/migrations/0097_reactions_emoji_code.py
+++ b/zerver/migrations/0097_reactions_emoji_code.py
@@ -3,7 +3,7 @@ import os
 
 import ujson
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0102_convert_muted_topic.py b/zerver/migrations/0102_convert_muted_topic.py
index 6e4e5bca16..7b448768d1 100644
--- a/zerver/migrations/0102_convert_muted_topic.py
+++ b/zerver/migrations/0102_convert_muted_topic.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.4 on 2017-08-30 00:26
 import ujson
 from django.db import connection, migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0104_fix_unreads.py b/zerver/migrations/0104_fix_unreads.py
index 0f0a193064..e875a6d2fc 100644
--- a/zerver/migrations/0104_fix_unreads.py
+++ b/zerver/migrations/0104_fix_unreads.py
@@ -1,6 +1,6 @@
 # Generated by Django 1.11.4 on 2017-08-30 00:26
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 from zerver.lib.fix_unreads import fix
diff --git a/zerver/migrations/0108_fix_default_string_id.py b/zerver/migrations/0108_fix_default_string_id.py
index f161cd65fa..23551fd9ea 100644
--- a/zerver/migrations/0108_fix_default_string_id.py
+++ b/zerver/migrations/0108_fix_default_string_id.py
@@ -1,6 +1,6 @@
 # Generated by Django 1.11.4 on 2017-08-24 02:39
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0109_mark_tutorial_status_finished.py b/zerver/migrations/0109_mark_tutorial_status_finished.py
index ab812714c5..e891d76c89 100644
--- a/zerver/migrations/0109_mark_tutorial_status_finished.py
+++ b/zerver/migrations/0109_mark_tutorial_status_finished.py
@@ -1,5 +1,5 @@
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0110_stream_is_in_zephyr_realm.py b/zerver/migrations/0110_stream_is_in_zephyr_realm.py
index d165efe471..e4f073b72b 100644
--- a/zerver/migrations/0110_stream_is_in_zephyr_realm.py
+++ b/zerver/migrations/0110_stream_is_in_zephyr_realm.py
@@ -1,6 +1,6 @@
 # Generated by Django 1.11.5 on 2017-10-08 18:37
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0121_realm_signup_notifications_stream.py b/zerver/migrations/0121_realm_signup_notifications_stream.py
index de4c697c62..d555af160c 100644
--- a/zerver/migrations/0121_realm_signup_notifications_stream.py
+++ b/zerver/migrations/0121_realm_signup_notifications_stream.py
@@ -2,7 +2,7 @@
 
 import django.db.models.deletion
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0126_prereg_remove_users_without_realm.py b/zerver/migrations/0126_prereg_remove_users_without_realm.py
index 1d23491985..04db151942 100644
--- a/zerver/migrations/0126_prereg_remove_users_without_realm.py
+++ b/zerver/migrations/0126_prereg_remove_users_without_realm.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.6 on 2017-11-30 04:58
 
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0128_scheduledemail_realm.py b/zerver/migrations/0128_scheduledemail_realm.py
index 219c4d71cf..c31b7b3786 100644
--- a/zerver/migrations/0128_scheduledemail_realm.py
+++ b/zerver/migrations/0128_scheduledemail_realm.py
@@ -2,7 +2,7 @@
 
 import django.db.models.deletion
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0130_text_choice_in_emojiset.py b/zerver/migrations/0130_text_choice_in_emojiset.py
index f53033bd17..d39071b886 100644
--- a/zerver/migrations/0130_text_choice_in_emojiset.py
+++ b/zerver/migrations/0130_text_choice_in_emojiset.py
@@ -1,5 +1,5 @@
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0139_fill_last_message_id_in_subscription_logs.py b/zerver/migrations/0139_fill_last_message_id_in_subscription_logs.py
index d0d7ce8773..af576a84d0 100644
--- a/zerver/migrations/0139_fill_last_message_id_in_subscription_logs.py
+++ b/zerver/migrations/0139_fill_last_message_id_in_subscription_logs.py
@@ -1,5 +1,5 @@
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0143_realm_bot_creation_policy.py b/zerver/migrations/0143_realm_bot_creation_policy.py
index 772294938f..d4323d756c 100644
--- a/zerver/migrations/0143_realm_bot_creation_policy.py
+++ b/zerver/migrations/0143_realm_bot_creation_policy.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.6 on 2018-03-09 18:00
 
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0145_reactions_realm_emoji_name_to_id.py b/zerver/migrations/0145_reactions_realm_emoji_name_to_id.py
index 5bc2f609bf..0eced4b139 100644
--- a/zerver/migrations/0145_reactions_realm_emoji_name_to_id.py
+++ b/zerver/migrations/0145_reactions_realm_emoji_name_to_id.py
@@ -2,7 +2,7 @@ from collections import defaultdict
 from typing import Any, Dict
 
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0149_realm_emoji_drop_unique_constraint.py b/zerver/migrations/0149_realm_emoji_drop_unique_constraint.py
index e6464ed522..43dd0d7b38 100644
--- a/zerver/migrations/0149_realm_emoji_drop_unique_constraint.py
+++ b/zerver/migrations/0149_realm_emoji_drop_unique_constraint.py
@@ -4,7 +4,7 @@ import shutil
 from boto.s3.connection import S3Connection
 from django.conf import settings
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0154_fix_invalid_bot_owner.py b/zerver/migrations/0154_fix_invalid_bot_owner.py
index f7dc355c89..7cadae8e52 100644
--- a/zerver/migrations/0154_fix_invalid_bot_owner.py
+++ b/zerver/migrations/0154_fix_invalid_bot_owner.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.6 on 2018-04-03 01:52
 
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0164_stream_history_public_to_subscribers.py b/zerver/migrations/0164_stream_history_public_to_subscribers.py
index 38c4b81868..1ed748ca2e 100644
--- a/zerver/migrations/0164_stream_history_public_to_subscribers.py
+++ b/zerver/migrations/0164_stream_history_public_to_subscribers.py
@@ -2,7 +2,7 @@
 
 from django.conf import settings
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0167_custom_profile_fields_sort_order.py b/zerver/migrations/0167_custom_profile_fields_sort_order.py
index 8702655f25..4f4c982e28 100644
--- a/zerver/migrations/0167_custom_profile_fields_sort_order.py
+++ b/zerver/migrations/0167_custom_profile_fields_sort_order.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.11 on 2018-04-08 15:49
 
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 from django.db.models import F
 
diff --git a/zerver/migrations/0174_userprofile_delivery_email.py b/zerver/migrations/0174_userprofile_delivery_email.py
index 4ccdd109d2..5509505c58 100644
--- a/zerver/migrations/0174_userprofile_delivery_email.py
+++ b/zerver/migrations/0174_userprofile_delivery_email.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.13 on 2018-07-05 17:57
 
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 from django.db.models import F
 
diff --git a/zerver/migrations/0175_change_realm_audit_log_event_type_tense.py b/zerver/migrations/0175_change_realm_audit_log_event_type_tense.py
index a0a66eac26..d75bdecd74 100644
--- a/zerver/migrations/0175_change_realm_audit_log_event_type_tense.py
+++ b/zerver/migrations/0175_change_realm_audit_log_event_type_tense.py
@@ -1,5 +1,5 @@
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0177_user_message_add_and_index_is_private_flag.py b/zerver/migrations/0177_user_message_add_and_index_is_private_flag.py
index eed9b09652..9692aed2ea 100644
--- a/zerver/migrations/0177_user_message_add_and_index_is_private_flag.py
+++ b/zerver/migrations/0177_user_message_add_and_index_is_private_flag.py
@@ -4,7 +4,7 @@ import sys
 
 import bitfield.models
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 from django.db.models import F
 
diff --git a/zerver/migrations/0181_userprofile_change_emojiset.py b/zerver/migrations/0181_userprofile_change_emojiset.py
index d50976afc4..e2bb6f0c2b 100644
--- a/zerver/migrations/0181_userprofile_change_emojiset.py
+++ b/zerver/migrations/0181_userprofile_change_emojiset.py
@@ -1,5 +1,5 @@
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0182_set_initial_value_is_private_flag.py b/zerver/migrations/0182_set_initial_value_is_private_flag.py
index e98f7719ed..fe5056d735 100644
--- a/zerver/migrations/0182_set_initial_value_is_private_flag.py
+++ b/zerver/migrations/0182_set_initial_value_is_private_flag.py
@@ -1,7 +1,7 @@
 import sys
 
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 from django.db.models import F
 
diff --git a/zerver/migrations/0189_userprofile_add_some_emojisets.py b/zerver/migrations/0189_userprofile_add_some_emojisets.py
index 1cd485c446..ad28634095 100644
--- a/zerver/migrations/0189_userprofile_add_some_emojisets.py
+++ b/zerver/migrations/0189_userprofile_add_some_emojisets.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.14 on 2018-08-28 19:01
 
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0198_preregistrationuser_invited_as.py b/zerver/migrations/0198_preregistrationuser_invited_as.py
index 88ebe8636c..ff09a7ade6 100644
--- a/zerver/migrations/0198_preregistrationuser_invited_as.py
+++ b/zerver/migrations/0198_preregistrationuser_invited_as.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.16 on 2018-12-27 17:09
 
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0206_stream_rendered_description.py b/zerver/migrations/0206_stream_rendered_description.py
index 8c92565271..0c6447a9f7 100644
--- a/zerver/migrations/0206_stream_rendered_description.py
+++ b/zerver/migrations/0206_stream_rendered_description.py
@@ -1,5 +1,5 @@
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 from zerver.lib.actions import render_stream_description
diff --git a/zerver/migrations/0209_user_profile_no_empty_password.py b/zerver/migrations/0209_user_profile_no_empty_password.py
index 4406fe2873..790c8484bb 100644
--- a/zerver/migrations/0209_user_profile_no_empty_password.py
+++ b/zerver/migrations/0209_user_profile_no_empty_password.py
@@ -6,7 +6,7 @@ import ujson
 from django.conf import settings
 from django.contrib.auth.hashers import check_password, make_password
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 from django.utils.timezone import now as timezone_now
 
diff --git a/zerver/migrations/0210_stream_first_message_id.py b/zerver/migrations/0210_stream_first_message_id.py
index 06956b80e5..1124509ebc 100644
--- a/zerver/migrations/0210_stream_first_message_id.py
+++ b/zerver/migrations/0210_stream_first_message_id.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.18 on 2019-02-25 12:42
 
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0211_add_users_field_to_scheduled_email.py b/zerver/migrations/0211_add_users_field_to_scheduled_email.py
index 44c10e4224..c5c37294d6 100644
--- a/zerver/migrations/0211_add_users_field_to_scheduled_email.py
+++ b/zerver/migrations/0211_add_users_field_to_scheduled_email.py
@@ -2,7 +2,7 @@
 
 from django.conf import settings
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0214_realm_invite_to_stream_policy.py b/zerver/migrations/0214_realm_invite_to_stream_policy.py
index 95829b0775..4b0614efe2 100644
--- a/zerver/migrations/0214_realm_invite_to_stream_policy.py
+++ b/zerver/migrations/0214_realm_invite_to_stream_policy.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.20 on 2019-04-29 05:29
 
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0217_migrate_create_stream_policy.py b/zerver/migrations/0217_migrate_create_stream_policy.py
index 174ac898bc..afe8276d59 100644
--- a/zerver/migrations/0217_migrate_create_stream_policy.py
+++ b/zerver/migrations/0217_migrate_create_stream_policy.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.20 on 2019-05-06 13:15
 
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0219_toggle_realm_digest_emails_enabled_default.py b/zerver/migrations/0219_toggle_realm_digest_emails_enabled_default.py
index df3c6afc85..295c05e1dc 100644
--- a/zerver/migrations/0219_toggle_realm_digest_emails_enabled_default.py
+++ b/zerver/migrations/0219_toggle_realm_digest_emails_enabled_default.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.20 on 2019-05-08 05:42
 
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0221_subscription_notifications_data_migration.py b/zerver/migrations/0221_subscription_notifications_data_migration.py
index b55f39bd02..7ab6049909 100644
--- a/zerver/migrations/0221_subscription_notifications_data_migration.py
+++ b/zerver/migrations/0221_subscription_notifications_data_migration.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.18 on 2019-02-13 20:13
 
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 RECIPIENT_STREAM = 2
diff --git a/zerver/migrations/0223_rename_to_is_muted.py b/zerver/migrations/0223_rename_to_is_muted.py
index 37565ec675..6b942baf0e 100644
--- a/zerver/migrations/0223_rename_to_is_muted.py
+++ b/zerver/migrations/0223_rename_to_is_muted.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.14 on 2018-08-10 16:04
 
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 from django.db.models import Case, Value, When
 
diff --git a/zerver/migrations/0224_alter_field_realm_video_chat_provider.py b/zerver/migrations/0224_alter_field_realm_video_chat_provider.py
index 0a5f40e1d3..9eac68373c 100644
--- a/zerver/migrations/0224_alter_field_realm_video_chat_provider.py
+++ b/zerver/migrations/0224_alter_field_realm_video_chat_provider.py
@@ -3,7 +3,7 @@
 from typing import Any, Dict, Optional
 
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 # We include a copy of this structure as it was at the time this
diff --git a/zerver/migrations/0227_inline_url_embed_preview_default_off.py b/zerver/migrations/0227_inline_url_embed_preview_default_off.py
index 654277f6b9..008184a0cf 100644
--- a/zerver/migrations/0227_inline_url_embed_preview_default_off.py
+++ b/zerver/migrations/0227_inline_url_embed_preview_default_off.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.20 on 2019-05-31 02:33
 
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0236_remove_illegal_characters_email_full.py b/zerver/migrations/0236_remove_illegal_characters_email_full.py
index 29e4699bb4..bf0536f0cd 100644
--- a/zerver/migrations/0236_remove_illegal_characters_email_full.py
+++ b/zerver/migrations/0236_remove_illegal_characters_email_full.py
@@ -3,7 +3,7 @@
 from unicodedata import category
 
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 NAME_INVALID_CHARS = ['*', '`', "\\", '>', '"', '@']
diff --git a/zerver/migrations/0237_rename_zulip_realm_to_zulipinternal.py b/zerver/migrations/0237_rename_zulip_realm_to_zulipinternal.py
index 7e4bdf4747..9d381876eb 100644
--- a/zerver/migrations/0237_rename_zulip_realm_to_zulipinternal.py
+++ b/zerver/migrations/0237_rename_zulip_realm_to_zulipinternal.py
@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0239_usermessage_copy_id_to_bigint_id.py b/zerver/migrations/0239_usermessage_copy_id_to_bigint_id.py
index c89c48698d..3ce6cdb2c3 100644
--- a/zerver/migrations/0239_usermessage_copy_id_to_bigint_id.py
+++ b/zerver/migrations/0239_usermessage_copy_id_to_bigint_id.py
@@ -3,7 +3,7 @@
 import time
 
 from django.db import connection, migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 from django.db.models import Min
 
diff --git a/zerver/migrations/0242_fix_bot_email_property.py b/zerver/migrations/0242_fix_bot_email_property.py
index 2134765223..0b7df0dbe4 100644
--- a/zerver/migrations/0242_fix_bot_email_property.py
+++ b/zerver/migrations/0242_fix_bot_email_property.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.24 on 2019-09-23 20:39
 
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0244_message_copy_pub_date_to_date_sent.py b/zerver/migrations/0244_message_copy_pub_date_to_date_sent.py
index 4cfb7e8aaa..bf8de599df 100644
--- a/zerver/migrations/0244_message_copy_pub_date_to_date_sent.py
+++ b/zerver/migrations/0244_message_copy_pub_date_to_date_sent.py
@@ -1,7 +1,7 @@
 import time
 
 from django.db import connection, migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 from django.db.models import Min
 
diff --git a/zerver/migrations/0247_realmauditlog_event_type_to_int.py b/zerver/migrations/0247_realmauditlog_event_type_to_int.py
index e090c9d37e..21b43027a0 100644
--- a/zerver/migrations/0247_realmauditlog_event_type_to_int.py
+++ b/zerver/migrations/0247_realmauditlog_event_type_to_int.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.24 on 2019-10-02 16:48
 
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 INT_VALUE = {
diff --git a/zerver/migrations/0248_userprofile_role_start.py b/zerver/migrations/0248_userprofile_role_start.py
index 1c556aeb0f..74ef476ba6 100644
--- a/zerver/migrations/0248_userprofile_role_start.py
+++ b/zerver/migrations/0248_userprofile_role_start.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.24 on 2019-10-03 22:27
 
 from django.db import migrations, models
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 def update_role(apps: StateApps, schema_editor: DatabaseSchemaEditor) -> None:
diff --git a/zerver/migrations/0257_fix_has_link_attribute.py b/zerver/migrations/0257_fix_has_link_attribute.py
index d2cd0b98ab..70a3a7d9b5 100644
--- a/zerver/migrations/0257_fix_has_link_attribute.py
+++ b/zerver/migrations/0257_fix_has_link_attribute.py
@@ -4,7 +4,7 @@ import time
 
 import lxml
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 BATCH_SIZE = 1000
diff --git a/zerver/migrations/0260_missed_message_addresses_from_redis_to_db.py b/zerver/migrations/0260_missed_message_addresses_from_redis_to_db.py
index 286b0de675..ee5a4d8159 100644
--- a/zerver/migrations/0260_missed_message_addresses_from_redis_to_db.py
+++ b/zerver/migrations/0260_missed_message_addresses_from_redis_to_db.py
@@ -1,6 +1,6 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 # Imported to avoid needing to duplicate redis-related code.
diff --git a/zerver/migrations/0264_migrate_is_announcement_only.py b/zerver/migrations/0264_migrate_is_announcement_only.py
index 611b464422..176fe530e1 100644
--- a/zerver/migrations/0264_migrate_is_announcement_only.py
+++ b/zerver/migrations/0264_migrate_is_announcement_only.py
@@ -1,7 +1,7 @@
 # Generated by Django 1.11.26 on 2020-01-25 23:47
 
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 
diff --git a/zerver/migrations/0273_migrate_old_bot_messages.py b/zerver/migrations/0273_migrate_old_bot_messages.py
index 6f47539b53..edacd198b0 100644
--- a/zerver/migrations/0273_migrate_old_bot_messages.py
+++ b/zerver/migrations/0273_migrate_old_bot_messages.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 
 from django.conf import settings
 from django.db import migrations
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 from django.db.migrations.state import StateApps
 
 from typing import Any