diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 2cc8931a3ba7ca4c72e87f5f932eb01b84afab61..86ee6cea23a8553ad2ef9978677f24553a4e3e93 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -1072,8 +1072,8 @@ function _drupal_get_filename_perform_file_scan($type, $name) {
  */
 function _drupal_get_filename_fallback_trigger_error($type, $name, $error_type) {
   // Hide messages due to known bugs that will appear on a lot of sites.
-  // @todo Remove this in https://www.drupal.org/node/2762241
-  if (empty($name) || ($type == 'module' && $name == 'default')) {
+  // @todo Remove this in https://www.drupal.org/node/2383823
+  if (empty($name)) {
     return;
   }
 
diff --git a/modules/system/system.install b/modules/system/system.install
index fa794eb6bf9d43e8c1ff39d0b68d7143cd9896b4..ae55b892fed6a464854e406da625e0c23ccf92dc 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -3270,6 +3270,21 @@ function system_update_7080() {
   db_change_field('date_format_locale', 'format', 'format', $spec);
 }
 
+/**
+ * Remove the Drupal 6 default install profile if it is still in the database.
+ */
+function system_update_7081() {
+  // Sites which used the default install profile in Drupal 6 and then updated
+  // to Drupal 7.44 or earlier will still have a record of this install profile
+  // in the database that needs to be deleted.
+  db_delete('system')
+    ->condition('filename', 'profiles/default/default.profile')
+    ->condition('type', 'module')
+    ->condition('status', 0)
+    ->condition('schema_version', 0)
+    ->execute();
+}
+
 /**
  * @} End of "defgroup updates-7.x-extra".
  * The next series of updates should start at 8000.