Second attempt to fix Travis build matrix