Revert "Fix ROOT-6036 (thanks bill)"

This reverts commit 34173d063d2f27c2728dd11e14a2bd8f0e0bb428.
The strategy adopted was actually wrong!