consistent use of the offset calculation workaround


git-svn-id: https://root.cern.ch/svn/root/trunk@48819 27541ba8-7e3a-0410-8455-c3a389f83636
remove workaround for #100729


git-svn-id: https://root.cern.ch/svn/root/trunk@48820 27541ba8-7e3a-0410-8455-c3a389f83636