Revert "Import of r45715 from trunk." (ROOT-5024)

This reverts commit 6405a46a98b424906f8c1bcb0cd6a6750b39196a.