Revert "Fix for Bug 114."

This reverts commit 47538f5568578658ba89f62281a46bab28e81974.

Signed-off-by: Martin Vitez <mvitez@cisco.com>