From 5986194c36af76da19cbc1e5321d1243794a6cce Mon Sep 17 00:00:00 2001
From: BigIronGuru <51454533+BigIronGuru@users.noreply.github.com>
Date: Mon, 24 Jun 2019 03:53:05 +0200
Subject: [PATCH] Fix G28 with non-BLTouch probes (#14381)

---
 Marlin/src/gcode/calibrate/G28.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index c451f975cc..083730823e 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -43,10 +43,6 @@
   #include "../../module/probe.h"
 #endif
 
-#if ENABLED(BLTOUCH)
-  #include "../../feature/bltouch.h"
-#endif
-
 #include "../../lcd/ultralcd.h"
 
 #if HAS_DRIVER(L6470)                         // set L6470 absolute position registers to counts
@@ -266,6 +262,10 @@ void GcodeSuite::G28(const bool always_home_all) {
 
     set_destination_from_current();
 
+    #if HAS_BED_PROBE
+      STOW_PROBE();
+    #endif
+
     #if Z_HOME_DIR > 0  // If homing away from BED do Z first
 
       if (doZ) homeaxis(Z_AXIS);
@@ -345,9 +345,6 @@ void GcodeSuite::G28(const bool always_home_all) {
     // Home Z last if homing towards the bed
     #if Z_HOME_DIR < 0
       if (doZ) {
-        #if ENABLED(BLTOUCH)
-          bltouch.init();
-        #endif
         #if ENABLED(Z_SAFE_HOMING)
           home_z_safely();
         #else