Second attempt at Travis build fix.