Revert "Merge pull request #13708 from gitmai/bug-937240-remove-mindgap"

This reverts commit 445a9fb8deddd15e617f000ef208bddbedd28f0b, reversing
changes made to a43eabc27773e3a4566645d58d1de6309503b5e0.