Revert "Merge branch 'mveghel-th3support' into 'master'"

This reverts merge request !3112 (merged)

fyi @mveghel: Sorry about this, but while the Gaudi MR is merged, I forgot to check if it is also in the latest release... 🙈
So the MR actually broke our prerelase nightly, which runs on Gaudi v36r0.
We will have to reopen your original MR and just mark it as WIP dependency until Gaudi has its next release :/