Revert of "Remove non-versioned elections (2602)" pull request