diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index b5aca98de..ab70ce629 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -2,8 +2,6 @@
 @import 'bootstrap-variables'; // our overwrites
 @import 'bootstrap/variables'; // the original bootstrap ones
 
-@import 'bootstrap-fix';
-
 @import 'perfect-scrollbar';
 
 @import "colors";
diff --git a/app/assets/stylesheets/bootstrap-fix.scss b/app/assets/stylesheets/bootstrap-fix.scss
deleted file mode 100644
index 47b6c0c4d..000000000
--- a/app/assets/stylesheets/bootstrap-fix.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-// A temporary fix for broken classes in bootstrap 2.
-// Can probably be removed when migration of bootstrap 3 is done.
-
-input::placeholder,
-textarea::placeholder {
-  color: #999999;
-}
-input::input-placeholder,
-textarea::input-placeholder {
-  color: #999999;
-}
-
-
-// A temporary fix for mention modal #5329
-
-#new_status_message_pane .modal {
-  position: absolute;
-  max-height: none;
-}
-
-#new_status_message_pane .modal-body{
-  overflow-y: visible;
-  max-height: none;
-}