Bad catkin workaround