Revert breaking change to ROS Service code which I introduced in 8d7d21072f87cc3c4ea06c29a3f0523b9348eb69