Remove workaround for ROOT6 bug

Remove the hideous partial workaround for a ROOT6 bug.  The bug, which is due to on demand header parsing, was backed out of the IB in the latestROOT6  patch.  This workaround is not needed now, and causes other problems.  Please merge promptly.