[ros-dev] r15402 breakage