Update the 'new' (r58) orbit control

Move fix from old to new.