diff --git a/eeschema/netlist_object.cpp b/eeschema/netlist_object.cpp
index 8b9e347ae1..87eb4a6a8e 100644
--- a/eeschema/netlist_object.cpp
+++ b/eeschema/netlist_object.cpp
@@ -379,7 +379,7 @@ bool NETLIST_OBJECT::IsLabelBusMemberType() const
 /*
  * return the net name of the item
  */
-wxString NETLIST_OBJECT::GetNetName( bool adoptTimestamp ) const
+wxString NETLIST_OBJECT::GetNetName() const
 {
     if( m_netNameCandidate == NULL )
         return wxEmptyString;
@@ -387,7 +387,7 @@ wxString NETLIST_OBJECT::GetNetName( bool adoptTimestamp ) const
     wxString netName;
 
     if( m_netNameCandidate->m_Type == NETLIST_ITEM::PIN )
-        return GetShortNetName( adoptTimestamp );
+        return GetShortNetName();
 
     if( !m_netNameCandidate->IsLabelGlobal() )
     {
@@ -405,7 +405,7 @@ wxString NETLIST_OBJECT::GetNetName( bool adoptTimestamp ) const
  * from the "best" label without any prefix.
  * 2 different nets can have the same short name
  */
-wxString NETLIST_OBJECT::GetShortNetName( bool adoptTimestamp ) const
+wxString NETLIST_OBJECT::GetShortNetName() const
 {
     if( m_netNameCandidate == NULL )
         return wxEmptyString;
@@ -419,10 +419,6 @@ wxString NETLIST_OBJECT::GetShortNetName( bool adoptTimestamp ) const
         {
             netName = wxT("Net-(");
             netName << link->GetRef( &m_netNameCandidate->m_SheetPath );
-
-            if( adoptTimestamp && netName.Last() == '?' )
-                netName << link->GetTimeStamp();
-
             netName << wxT("-Pad") << m_netNameCandidate->m_PinNum << wxT(")");
         }
     }
diff --git a/eeschema/netlist_object.h b/eeschema/netlist_object.h
index 2c30efecfc..007ce22eba 100644
--- a/eeschema/netlist_object.h
+++ b/eeschema/netlist_object.h
@@ -242,20 +242,17 @@ public:
 
     /**
      * Function GetNetName
-     * @param adoptTimestamp if annotation is not done (i.e. GetRef returns something with an ? at the end)
-     * @return the full net name of the item, i.e. the net name
-     * from the "best" label, prefixed by the sheet path
+     * @return the full net name of the item, i.e. the net name from the "best" label,
+     * prefixed by the sheet path
      */
-    wxString GetNetName( bool adoptTimestamp = false ) const;
+    wxString GetNetName() const;
 
     /**
      * Function GetShortNetName
-     * @param adoptTimestamp if annotation is not done (i.e. GetRef returns something with an ? at the end)
-     * @return the short net name of the item i.e. the net name
-     * from the "best" label without any prefix.
-     * 2 different nets can have the same short name
+     * @return the short net name of the item i.e. the net name from the "best" label
+     * without any prefix.  2 different nets can have the same short name
      */
-    wxString GetShortNetName( bool adoptTimestamp = false ) const;
+    wxString GetShortNetName() const;
 
     /**
      * Function ConvertBusToNetListItems