Gouvernathor
67e589f47f
avoid reevaluating the choice equality (cherry picked from commit 9b419fcbc3dce2238107cf4cb0fbbc5508df8584)