Revert "Cherry pick fix for start/end dates in ES from 2.x. Fixes issue #6218"

This reverts commit 46b30262796ad98ac88e12788c6fa9c5fb8a92fa.