Add toro back

Change-Id: I962a234d6bcf5b87d9a732679ada4935cbdaea6f