Backport of the removal of versioned election compatibility