Revert fix for issue #63 and add unit tests

This condition is now handled by the Cobra compiler and the add-in
does not need to make a special check for it.