Revert "Addressing issues srv/viso2#8, srv/viso2#9"

This reverts commit 147532c00fb93a5e3982328a8271946cf6ce5c33.