diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 1fcb011c111..bb4c642a807 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -4146,8 +4146,8 @@ function delete_user(stdClass $user) {
     // Don't trigger update event, as user is being deleted.
     user_update_user($updateuser, false, false);
 
-    // Now do a final accesslib cleanup - removes all role assignments in user context and context itself.
-    context_helper::delete_instance(CONTEXT_USER, $user->id);
+    // Delete all content associated with the user context, but not the context itself.
+    $usercontext->delete_content();
 
     // Any plugin that needs to cleanup should register this event.
     // Trigger event.