diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index cf28da1c412f5c847ebe1d66322bca076d4b6b8c..90033bd1cb330e830b5369f60b70ca15a6a334b0 100644
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -325,9 +325,6 @@ sub CopyContribFiles
         {
             $flist = ParseAndCleanRule($flist, $mf);
 
-            # Special case for contrib/spi
-            $flist = "autoinc.sql insert_username.sql moddatetime.sql refint.sql timetravel.sql"
-              if ($d eq 'spi');
             foreach my $f (split /\s+/,$flist)
             {
                 lcopy('contrib/' . $d . '/' . $f,$target . '/share/contrib/' . basename($f))
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 94c6297f148bc92515900cb102c494dde98884f6..21c11dffd765f1c2d1026eb512b425eb9fc6ff8f 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -579,10 +579,6 @@ sub GenerateContribSqlFiles
             $l = substr($l, 0, index($l, '$(addsuffix ')) . substr($l, $i+1);
         }
 
-        # Special case for contrib/spi
-        $l = "autoinc.sql insert_username.sql moddatetime.sql refint.sql timetravel.sql"
-          if ($n eq 'spi');
-
         foreach my $d (split /\s+/, $l)
         {
             my $in = "$d.in";
@@ -594,7 +590,6 @@ sub GenerateContribSqlFiles
                 my $cont = Project::read_file("contrib/$n/$in");
                 my $dn = $out;
                 $dn =~ s/\.sql$//;
-                if ($mf =~ /^MODULE_big\s*=\s*(.*)$/m) { $dn = $1 }
                 $cont =~ s/MODULE_PATHNAME/\$libdir\/$dn/g;
                 my $o;
                 open($o,">contrib/$n/$out") || croak "Could not write to contrib/$n/$d";