handmade change because of ros-infrastructure/bloom#252