Revert "Fix https://sft.its.cern.ch/jira/browse/ROOT-6606"

This reverts commit 14d3ff661e9e3b17507aeed6688551d37fd43356.