This reverts commit 16af904e05. The corresponding upstream fixes were merged into ament packages.
16af904e05