Revert "Make carla compile in master"

This reverts commit 633609fdc77cff8d4c7c325fcddc60392449670b.