Update to hack, see ros/ros_comm#285