Do not cherry-pick custom toolchain patch anymore