diff --git a/pcbnew/librairi.cpp b/pcbnew/librairi.cpp
index 34bbbe1fe8..21e9fc5871 100644
--- a/pcbnew/librairi.cpp
+++ b/pcbnew/librairi.cpp
@@ -47,7 +47,9 @@ MODULE* FOOTPRINT_EDIT_FRAME::Import_Module()
     if( config )
         config->Read( EXPORT_IMPORT_LASTPATH_KEY, &lastOpenedPathForLoading );
 
-    wxString importWildCard = ModExportFileWildcard + wxT("|") + ModImportFileWildcard;
+    wxString importWildCard =   FootprintLibFileWildcard + wxT("|") +
+                                ModExportFileWildcard + wxT("|") +
+                                ModImportFileWildcard;
 
     wxFileDialog dlg( this, _( "Import Footprint Module" ),
                       lastOpenedPathForLoading, wxEmptyString,
diff --git a/pcbnew/pcb_parser.cpp b/pcbnew/pcb_parser.cpp
index 9cfd551556..1a91537c62 100644
--- a/pcbnew/pcb_parser.cpp
+++ b/pcbnew/pcb_parser.cpp
@@ -2135,13 +2135,13 @@ D_PAD* PCB_PARSER::parseD_PAD() throw( IO_ERROR, PARSE_ERROR )
             {
                 int layerMask = parseBoardItemLayersAsMask();
 
-                /*
-                // Only the layers that are used are saved so we need to enable all the copper
-                // layers to prevent any problems with the current design.  At some point in
-                // the future, the layer handling should be improved.
+                // 15-Nov-2012 before today, only the cu layers that were used were
+                // saved.  After wildcard *.Cu support went into effect, this is no
+                // longer an issue, but in order to load the interrim s-expression files,
+                // turn on all Cu layers for thru hole pads.  New files will not need this
+                // and eventually this code can be removed.
                 if( pad->GetAttribute() == PAD_STANDARD )
                     layerMask |= ALL_CU_LAYERS;
-                */
 
                 pad->SetLayerMask( layerMask );
             }