revert to a more sensible numbering scheme