diff --git a/app/views/layouts/devise_layout.html.haml b/app/views/layouts/devise.html.haml
similarity index 100%
rename from app/views/layouts/devise_layout.html.haml
rename to app/views/layouts/devise.html.haml
diff --git a/config/application.rb b/config/application.rb
index fd0dd019..27de3fa2 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -53,9 +53,5 @@ module Gitlab
 
     # Add fonts
     config.assets.paths << "#{Rails.root}/app/assets/fonts"
-
-    config.to_prepare do
-      Devise::SessionsController.layout 'devise_layout'
-    end
   end
 end