Revert "Adjust Carla for master branch"

This reverts commit 30e0140ecbf17764a6d4eccb9d63d62c231a4e90.