[ros-diffs] [fireball] 26996: - Revert 26995 since it breaks booting.