diff --git a/lib/blacklight/runtime_registry.rb b/lib/blacklight/runtime_registry.rb
index 658358f8c8..f0aa0bc31c 100644
--- a/lib/blacklight/runtime_registry.rb
+++ b/lib/blacklight/runtime_registry.rb
@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
-require 'active_support/per_thread_registry'
-
 module Blacklight
   class RuntimeRegistry
-    extend ActiveSupport::PerThreadRegistry
-
-    attr_accessor :connection, :connection_config
+    thread_mattr_accessor :connection, :connection_config
   end
 end