Revert "removed some code that was commented out"

This reverts commit 8e3498977a5ea04333c68f1f2c3b8a2805959d43.

trying to allow a rebase to the released ivi repo...
Revert "Revert "removed some code that was commented out""

This reverts commit 433a7bad8c61379e241a8da0549a841d8080c2d9.