Revert #11890 and add a test that would have caught the error (#11914) #434

Job	Run time
build-test-publish-wheel / build-container / main	1m 17s
build-test-publish-wheel / build-wheel	32s
build-test-publish-wheel / test-wheel	6m 2s
build-test-publish-wheel / publish-wheel	8s
build-test-publish-wheel / notify	3s
	8m 2s

Provide feedback