Get builds passing on travis-ci again

[Finishes #70702294]