Refactor #5814: pass select_toolchain_version