Revert "Merge branch 'fix/8467' of github.com:nknize/elasticsearch into fix/8467"

This reverts commit 4b29213e1b31284a9d75d47d0e56f52cc25d5818, reversing
changes made to 69ac8382595deaebb7906d7c9e535896ab9d08e8.