Temporary fix for rviz/#733