Revert "Merge branch 'groovy_unstable' of https://github.com/uscauv/uscauv-ros-pkg into groovy_unstable"

This reverts commit 135e833ec1848cbfd507ca5056fdd65cb3284e21, reversing
changes made to d688a9ff2998f911228cd9fca727a25fd8417e77.

"Reverting bad merge"