Switch back to old numbering routines