diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1cef80fdb2..eac5fa5068 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -508,7 +508,7 @@ set( wxWidgets_CONFIG_OPTIONS --static=no )
 if( APPLE AND ( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES OR KICAD_SCRIPTING_WXPYTHON) )
     find_package( wxWidgets COMPONENTS gl adv html core net base xml QUIET )
 else()
-    find_package( wxWidgets COMPONENTS gl aui adv html core net base xml QUIET )
+    find_package( wxWidgets COMPONENTS gl adv html core net base xml QUIET )
 endif()
 
 if( NOT (KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC) )
diff --git a/pcbnew/plot_brditems_plotter.cpp b/pcbnew/plot_brditems_plotter.cpp
index d5795e2098..0b93de9407 100644
--- a/pcbnew/plot_brditems_plotter.cpp
+++ b/pcbnew/plot_brditems_plotter.cpp
@@ -124,13 +124,6 @@ bool BRDITEMS_PLOTTER::PlotAllTextsModule( MODULE* aModule )
     if( textLayer > LAYER_ID_COUNT )        // how will this ever be true?
         return false;
 
-    // Special rule: assembly always shows reference from the silk layer
-    if( (m_layerMask[F_Fab]) && (textLayer == F_SilkS) )
-        trace_ref = true;
-
-    if( (m_layerMask[B_Fab]) && (textLayer == B_SilkS) )
-        trace_ref = true;
-
     if( !m_layerMask[textLayer] )
         trace_val = false;
 
@@ -223,12 +216,7 @@ void BRDITEMS_PLOTTER::PlotTextModule( TEXTE_MODULE* pt_texte, EDA_COLOR_T aColo
 
     // calculate some text parameters :
     size = pt_texte->GetSize();
-
-    // Assembly drawings always have the reference on the origin
-    if( m_layerMask[F_Fab] || m_layerMask[B_Fab] )
-        pos = static_cast<MODULE*>( pt_texte->GetParent() )->GetPosition();
-    else
-        pos = pt_texte->GetTextPosition();
+    pos = pt_texte->GetTextPosition();
 
     orient = pt_texte->GetDrawRotation();