diff --git a/pcbnew/kicad_plugin.cpp b/pcbnew/kicad_plugin.cpp
index eef47d7a51..2b8e027faa 100644
--- a/pcbnew/kicad_plugin.cpp
+++ b/pcbnew/kicad_plugin.cpp
@@ -1186,9 +1186,6 @@ void PCB_IO::formatLayers( LSET aLayerMask, int aNestLevel ) const
 
     LSET cu_mask = cu_all;
 
-    if( m_board )
-        cu_mask &= m_board->GetEnabledLayers();
-
     // output copper layers first, then non copper
 
     if( ( aLayerMask & cu_mask ) == cu_mask )
@@ -1240,9 +1237,6 @@ void PCB_IO::formatLayers( LSET aLayerMask, int aNestLevel ) const
 
     // output any individual layers not handled in wildcard combos above
 
-    if( m_board )
-        aLayerMask &= m_board->GetEnabledLayers();
-
     wxString layerName;
 
     for( LAYER_NUM layer = 0; layer < PCB_LAYER_ID_COUNT; ++layer )
@@ -1332,7 +1326,7 @@ void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const
         m_out->Print( 0, ")" );
     }
 
-    formatLayers( aPad->GetLayerSet(), 0 );
+    formatLayers( aPad->GetLayerSet() );
 
     // Output the radius ratio for rounded rect pads
     if( aPad->GetShape() == PAD_SHAPE_ROUNDRECT )