diff --git a/pcbnew/class_module.cpp b/pcbnew/class_module.cpp
index 5b3588edcd..58e7e24e8b 100644
--- a/pcbnew/class_module.cpp
+++ b/pcbnew/class_module.cpp
@@ -729,7 +729,7 @@ void MODULE::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM
 
 bool MODULE::HitTest( const wxPoint& aPosition, int aAccuracy ) const
 {
-    EDA_RECT rect = m_BoundaryBox.GetBoundingBoxRotated( GetPosition(), m_Orient );
+    EDA_RECT rect = m_BoundaryBox;//.GetBoundingBoxRotated( GetPosition(), m_Orient );
     return rect.Inflate( aAccuracy ).Contains( aPosition );
 }
 
@@ -746,7 +746,7 @@ bool MODULE::HitTest( const EDA_RECT& aRect, bool aContained, int aAccuracy ) co
     arect.Inflate( aAccuracy );
 
     if( aContained )
-        return arect.Contains( m_BoundaryBox.GetBoundingBoxRotated( GetPosition(), m_Orient ) );
+        return arect.Contains( m_BoundaryBox );
     else
     {
         // If the rect does not intersect the bounding box, skip any tests
@@ -1591,7 +1591,7 @@ extern bool ConvertOutlineToPolygon( std::vector<DRAWSEGMENT*>& aSegList, SHAPE_
         wxString* aErrorText, unsigned int aTolerance, wxPoint* aErrorLocation = nullptr );
 
 
-std::shared_ptr<SHAPE> MODULE::GetEffectiveShape( PCB_LAYER_ID aLayer ) const   
+std::shared_ptr<SHAPE> MODULE::GetEffectiveShape( PCB_LAYER_ID aLayer ) const
 {
     std::shared_ptr<SHAPE> shape ( new SHAPE_NULL );
 
diff --git a/pcbnew/class_module.h b/pcbnew/class_module.h
index 298a26c4f3..2be930bc97 100644
--- a/pcbnew/class_module.h
+++ b/pcbnew/class_module.h
@@ -146,11 +146,18 @@ public:
 
     /**
      * Function GetFootprintRect()
-     * Returns the area of the module footprint excluding any text.
+     * Build and returns the boundary box of the module footprint excluding any text.
      * @return EDA_RECT - The rectangle containing the footprint.
      */
     EDA_RECT GetFootprintRect() const;
 
+    /**
+     * Returns the last calculated bounding box of the footprint (does not recalculate it).
+     * (call CalculateBoundingBox() to recalculate it)
+     * @return EDA_RECT - The rectangle containing the footprint
+     */
+    EDA_RECT GetBoundingBoxBase() const { return m_BoundaryBox; }
+
     /**
      * Returns the bounding box containing pads when the footprint
      * is on the front side, orientation 0, position 0,0.