Revert old commit. Added failsafe to Player Numbers handler selection.