diff --git a/common/advanced_config.cpp b/common/advanced_config.cpp
index 2351da8d75..3ad6ed94ee 100644
--- a/common/advanced_config.cpp
+++ b/common/advanced_config.cpp
@@ -165,7 +165,6 @@ ADVANCED_CFG::ADVANCED_CFG()
     // Init defaults - this is done in case the config doesn't exist,
     // then the values will remain as set here.
     m_EnableUsePadProperty = false;
-    m_EnableUsePinFunction = false;
     m_realTimeConnectivity = true;
     m_coroutineStackSize = AC_STACK::default_stack;
 
@@ -204,9 +203,6 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::UsePadProperty,
                                                 &m_EnableUsePadProperty, false ) );
 
-    configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::UsePinFunction,
-                                                &m_EnableUsePinFunction, false ) );
-
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::RealtimeConnectivity,
                                                 &m_realTimeConnectivity, false ) );
 
diff --git a/include/advanced_config.h b/include/advanced_config.h
index 53fb6032a1..5db05d2d1f 100644
--- a/include/advanced_config.h
+++ b/include/advanced_config.h
@@ -68,11 +68,6 @@ public:
      */
     static const ADVANCED_CFG& GetCfg();
 
-    /**
-     * Enable pad pin function handling in pcbnew.
-     */
-    bool m_EnableUsePinFunction;
-
     /**
      * Enable pad property handling in pcbnew.
      */
diff --git a/pcbnew/kicad_plugin.cpp b/pcbnew/kicad_plugin.cpp
index b8275bd65c..2a57b58b11 100644
--- a/pcbnew/kicad_plugin.cpp
+++ b/pcbnew/kicad_plugin.cpp
@@ -1424,15 +1424,12 @@ void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const
         StrPrintf( &output, " (net %d %s)", m_mapping->Translate( aPad->GetNetCode() ),
                    m_out->Quotew( aPad->GetNetname() ).c_str() );
 
-    if( ADVANCED_CFG::GetCfg().m_EnableUsePinFunction )
-    {
-        // Add pinfunction, if exists.
-        // Pin function is closely related to nets, so if CTL_OMIT_NETS is set,
-        // omit also pin function (for instance when saved from library editor)
-        if( !(m_ctl & CTL_OMIT_NETS) && !aPad->GetPinFunction().IsEmpty() )
-            StrPrintf( &output, " (pinfunction %s)",
-                       m_out->Quotew( aPad->GetPinFunction() ).c_str() );
-    }
+    // Add pinfunction, if exists.
+    // Pin function is closely related to nets, so if CTL_OMIT_NETS is set,
+    // omit also pin function (for instance when saved from library editor)
+    if( !(m_ctl & CTL_OMIT_NETS) && !aPad->GetPinFunction().IsEmpty() )
+        StrPrintf( &output, " (pinfunction %s)",
+                   m_out->Quotew( aPad->GetPinFunction() ).c_str() );
 
     if( aPad->GetPadToDieLength() != 0 )
         StrPrintf( &output, " (die_length %s)",