Revert "BUG-1196, Bug 886: Refactored implementation of Choice Codec"

This reverts commit b4bce5faa5b5dd25c1caaee34e04495b79676677.
which was buggy cherry-pick (due to imcompatibility
of API) from master and actually it introduced regression.

Change-Id: I28800b7a21bc11696a10e1d9e19c0aff829b4f41
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>