Revert "[BUGFIX] ChooseViewHelper wasn't relying on property value to determine if an option was selected"

This reverts commit c1bcc42f313c47d94a94a441dae42c4bd79003bd.