Restored ROS compatibility after non-ROS changes.