diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index f27909d3f..7cc2f1324 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -679,18 +679,13 @@ class Quitter:
 
     @cmdutils.register(instance='quitter', name='quit')
     @cmdutils.argument('session', completion=miscmodels.session)
-    def quit(self, all=False, save=False, session=None):
+    def quit(self, save=False, session=None):
         """Quit qutebrowser.
         Args:
-            all: When given, closes all windows and kills the current instance
             save: When given, save the open windows even if auto_save.session
                   is turned off.
             session: The name of the session to save.
         """
-        if  not all:
-            window = QApplication.activeWindow()
-            window.close()
-            return
         if session is not None and not save:
             raise cmdexc.CommandError("Session name given without --save!")
         if save:
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 4e5089dbd..cd0b1edb3 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -3,9 +3,9 @@
 aliases:
   default:
     w: session-save
-    q: quit
-    qa: quit --all
-    wqa: quit --all --save
+    q: close
+    qa: quit
+    wqa: quit --save
   type:
     name: Dict
     keytype: