Revert !4154

The workaround introduced with !4154 (merged) is not needed anymore, since the required feature in Gaudi (gaudi/Gaudi!1465 (merged)) has been merged long time ago and available in various releases.

This reverts merge request !4154 (merged)