Copy https://github.com/personalrobotics/aikido/pull/606 functionality to this repo as well.
Copy personalrobotics/aikido#606 functionality to this repo as well.