Revert to older toolchain