I'm not sure why travis changes are in this CL. This looks like it would conflict with my changes in the other PR.