diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
new file mode 100644
index 0000000..70c4f00
--- /dev/null
+++ b/app/views/layouts/devise.html.haml
@@ -0,0 +1,6 @@
+!!! 5
+%html{ lang: "en"}
+  = render "layouts/head"
+  %body.ui_basic.login-page
+    = render partial: "layouts/flash"
+    .container= yield
diff --git a/app/views/layouts/devise_layout.html.haml b/app/views/layouts/devise_layout.html.haml
deleted file mode 100644
index 70c4f00..0000000
--- a/app/views/layouts/devise_layout.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-!!! 5
-%html{ lang: "en"}
-  = render "layouts/head"
-  %body.ui_basic.login-page
-    = render partial: "layouts/flash"
-    .container= yield
diff --git a/config/application.rb b/config/application.rb
index fd0dd01..27de3fa 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
--
libgit2 0.21.2