Index: server/fedora/config/etc/httpd/conf/httpd.conf
===================================================================
--- server/fedora/config/etc/httpd/conf/httpd.conf	(revision 335)
+++ server/fedora/config/etc/httpd/conf/httpd.conf	(revision 358)
@@ -241,10 +241,4 @@
 </Location>
 
-<VirtualHost _default_:80>
-    ServerName vhosts.mit.edu
-    DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
-    Include conf.d/vhosts-common.conf
-</VirtualHost>
-
 <VirtualHost 18.181.0.50:80>
     ServerName scripts-cert.mit.edu
@@ -257,4 +251,10 @@
     Include conf.d/scripts-vhost-names.conf
     Include conf.d/scripts-vhost.conf
+    Include conf.d/vhosts-common.conf
+</VirtualHost>
+
+<VirtualHost *:80>
+    Include conf.d/vhosts-vhost-names.conf
+    DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
     Include conf.d/vhosts-common.conf
 </VirtualHost>
@@ -288,24 +288,22 @@
     </VirtualHost>
     <VirtualHost *:443>
-        ServerName vhosts.mit.edu
-        ServerAlias vhosts
-        DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
-        Include conf.d/vhosts-common-ssl.conf
-    </VirtualHost>
-    <VirtualHost *:443>
         Include conf.d/scripts-vhost-names.conf
         Include conf.d/scripts-vhost.conf
         Include conf.d/vhosts-common-ssl.conf
     </VirtualHost>
-    <VirtualHost *:444>
-        ServerName vhosts.mit.edu
-        ServerAlias vhosts
+    <VirtualHost *:443>
+	Include conf.d/vhosts-vhost-names.conf
         DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
         Include conf.d/vhosts-common-ssl.conf
-        Include conf.d/vhosts-common-ssl-cert.conf
     </VirtualHost>
     <VirtualHost *:444>
         Include conf.d/scripts-vhost-names.conf
         Include conf.d/scripts-vhost.conf
+        Include conf.d/vhosts-common-ssl.conf
+        Include conf.d/vhosts-common-ssl-cert.conf
+    </VirtualHost>
+    <VirtualHost *:444>
+	Include conf.d/vhosts-vhost-names.conf
+        DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
         Include conf.d/vhosts-common-ssl.conf
         Include conf.d/vhosts-common-ssl-cert.conf