Fix toro up a little better.

Change-Id: I440dfac3a371f8bbb3a6e3ce46117fd996a0c46e