Open evgeni opened 2 weeks ago
Fixes: #2101
Draft until we get rid of the last EL7 node where this won't work.
Fixes: #2101