Revert "Merge pull request #1716 from isucan/bloom-moveit_ros-0"

This reverts commit 55e23d01a46afc5bf89f1556611f91e63d036c1d, reversing
changes made to d1a0836f7f3c25d6ef6a2f8ea01a125bc8df7512.