Undo workaround for ROOT6 namespace bug

A few days ago a temporary workaround for a ROOT6 bug was submitted and merged into the CMSSW ROOT6 branch. The ROOT team surprised us by fixing the bug within a day.  This pull request removes the workaround.