Merge pull request #3686 from Armada651/revert-3578 Revert "Merge pull request #3578 from Armada651/forced-slow-depth"
