Revert "Bug 1478 - Autoboxing support"

Autoboxing support did not compiled properly with
extensive uses of cases and grouping.

This was found in integration with models
from other projects.

This reverts commit 473b1615dd9b523b96aef8b92424e7664eb7c089.

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