Following https://github.com/elastic/elasticsearch/pull/60524 (reversing #224).