Fix fallout from #2492 Travis failure

This breaks the one-library-per-pull-request rule, but fixes 2x external flubs from #2492.

When this is merged, I'll redo #2492.