Old RC: remove goto divide-by-two hack (fix #4236)