Remove travis workarounds for previous build system