Revert "BUG-1196: fixed bug in choice case codec."

This reverts commit 92e4fd194891f567aad81f36352aaf9c80df7838.

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