Revert "Merge" #1079

Job	Run time
build (production)	4m 16s
build (test)	2m 44s
test (3.0, 1)	8m 14s
End to End testing (3.0)	5m 0s
Testing search (3.0, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 27s
End to End testing (3.1)	5m 48s
test (3.0, 2)	7m 1s
Testing search (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	3m 38s
End to End testing (.ruby-version)	4m 54s
test (3.0, 3)	7m 42s
Testing search (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13)	5m 55s
test (3.0, 4)	7m 18s
Testing search (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2)	4m 37s
test (3.1, 1)	4m 56s
test (3.1, 2)	4m 23s
test (3.1, 3)	5m 12s
test (3.1, 4)	8m 8s
test (.ruby-version, 1)	5m 9s
test (.ruby-version, 2)	5m 59s
test (.ruby-version, 3)	3m 52s
test (.ruby-version, 4)	6m 36s
	1h 54m 49s

Provide feedback