fixes #549 and partially reverts #c7dd64dc #48

Job	Run time
run-scenario-tests (2, 9.0.73-jdk11-temurin-focal, /opt/java/openjdk, 22, 4, 1, 1, https://source...	38m 39s
run-scenario-tests (2, 9.0.73-jdk11-temurin-focal, /opt/java/openjdk, 22, 4, 1, 1, https://source...	38m 38s
run-scenario-tests (2, 9.0.73-jdk11-temurin-focal, /opt/java/openjdk, 22, 4, 1, 1, https://source...	38m 38s
run-scenario-tests (2, 9.0.73-jdk11-temurin-focal, /opt/java/openjdk, 23, 1, 1, 1, https://source...	38m 38s
run-scenario-tests (2, 9.0.73-jdk11-temurin-focal, /opt/java/openjdk, 23, 1, 1, 1, https://source...	38m 37s
run-scenario-tests (2, 9.0.73-jdk11-temurin-focal, /opt/java/openjdk, 23, 1, 1, 1, https://source...	38m 36s
push-internal-pr-images	1s
	3h 51m 47s

Provide feedback