Remove woraround for ROOT6 bug that has been fixed
Merge pull request #3759 from wmtan/RemoveWorkaround

ROOT6 -- Remove workaround for fixed ROOT6 bug