Revert "Merge pull request #22598 from KevinGrandon/bug_1049014_search_start_stop_grid" for Gu bustage

This reverts commit 7e207c9aef2b36692b8ae1f7ebdf02e84299aaed.