diff --git a/Changelog.md b/Changelog.md
index 077d4ce5a..26cfec22b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,6 +10,8 @@
 * Made number of unicorn workers configurable.
 * Made loading of the configuration environment independent of Rails.
 * Do not generate paths like `/a/b/c/config/boot.rb/../../Gemfile` to require and open things, create a proper path instead.
+* Remove the hack for loading the entire lib folder with a proper solution. [#3809](https://github.com/diaspora/diaspora/issues/3750)
+
 
 ## Features
 
diff --git a/config/application.rb b/config/application.rb
index 1eb8fa2f9..f8b35569c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -32,12 +32,8 @@ module Diaspora
     # -- all .rb files in that directory are automatically loaded.
 
     # Add additional load paths for your own custom dirs
-     #config.autoload_paths += %W(#{config.root}/lib)
-     config.autoload_paths += %W(#{config.root}/lib #{config.root}/app/presenters)
-     #OMG HAX PLZ FIX MAKE ALL LIB AUTOLOAD KTHNX
-     config.autoload_paths += %W(#{config.root}/lib/*)
-     config.autoload_paths += %W(#{config.root}/lib/*/*)
-     config.autoload_paths += %W(#{config.root}/lib/*/*/*)
+     config.autoload_paths += %W(#{config.root}/app/presenters)
+     config.autoload_paths += %W(#{config.root}/lib)
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named