diff --git a/utils/build-script-impl b/utils/build-script-impl
index 293e87c5237d0..2e0652da1e588 100755
--- a/utils/build-script-impl
+++ b/utils/build-script-impl
@@ -1320,234 +1320,12 @@ function get_host_specific_variable() {
 }
 
 function calculate_targets_for_host() {
-    local host=$1
-
-    SWIFT_STDLIB_TARGETS=()
-    SWIFT_SDKS=()
-    SWIFT_BENCHMARK_TARGETS=()
-    SWIFT_RUN_BENCHMARK_TARGETS=()
-    SWIFT_TEST_TARGETS=()
-
-    # Get the list of Target platforms for the Host
-    local stdlib_targets=($(get_stdlib_targets_for_host ${host}))
-
-    for stdlib_deployment_target in "${stdlib_targets[@]}"; do
-        local swift_sdk=
-        local is_in_build_list=$(should_build_stdlib_target ${stdlib_deployment_target} ${host})
-        local build_for_this_target=1
-        local test_this_target=1
-        local test_host_only=
-        local build_benchmark_this_target=
-        local build_external_benchmark_this_target=
-        local test_benchmark_this_target=
-
-        case ${stdlib_deployment_target} in
-            linux-*)
-                swift_sdk="LINUX"
-                build_for_this_target=$(not ${SKIP_BUILD_LINUX})
-                test_this_target=$(not ${SKIP_TEST_LINUX})
-                ;;
-            freebsd-*)
-                swift_sdk="FREEBSD"
-                build_for_this_target=$(not ${SKIP_BUILD_FREEBSD})
-                test_this_target=$(not ${SKIP_TEST_FREEBSD})
-                ;;
-            cygwin-*)
-                swift_sdk="CYGWIN"
-                build_for_this_target=$(not ${SKIP_BUILD_CYGWIN})
-                test_this_target=$(not ${SKIP_TEST_CYGWIN})
-                ;;
-            haiku-*)
-                swift_sdk="HAIKU"
-                build_for_this_target=$(not ${SKIP_BUILD_HAIKU})
-                test_this_target=$(not ${SKIP_TEST_HAIKU})
-                ;;
-            macosx-*)
-                swift_sdk="OSX"
-                build_for_this_target=$(not ${SKIP_BUILD_OSX})
-                test_this_target=$(not ${SKIP_TEST_OSX})
-                build_benchmark_this_target=$(not ${SKIP_BUILD_OSX})
-                build_external_benchmark_this_target=$(not ${SKIP_BUILD_OSX})
-                test_benchmark_this_target=$(not ${SKIP_BUILD_OSX})
-                ;;
-            iphoneos-*)
-                swift_sdk="IOS"
-                build_for_this_target=$(not ${SKIP_BUILD_IOS_DEVICE})
-                if [[ ! "${SKIP_TEST_IOS_HOST}" ]] ; then
-                    test_host_only=1
-                else
-                    test_this_target=
-                fi
-                build_benchmark_this_target=$(not ${SKIP_BUILD_IOS_DEVICE})
-                build_external_benchmark_this_target=$(not ${SKIP_BUILD_IOS_DEVICE})
-
-                # Never build iOS armv7s benchmarks.
-                if [[ "${stdlib_deployment_target}" == "iphoneos-armv7s" ]]; then
-                    build_benchmark_this_target=
-                    build_external_benchmark_this_target=
-                fi
-                ;;
-            iphonesimulator-x86_64)
-                swift_sdk="IOS_SIMULATOR"
-                build_for_this_target=$(not ${SKIP_BUILD_IOS_SIMULATOR})
-                test_this_target=$(not ${SKIP_TEST_IOS_SIMULATOR})
-                ;;
-            iphonesimulator-i386)
-                swift_sdk="IOS_SIMULATOR"
-                build_for_this_target=$(not ${SKIP_BUILD_IOS_SIMULATOR})
-                if [[ "${SKIP_TEST_IOS_SIMULATOR}" == "1" ]] ; then
-                    SKIP_TEST_IOS_32BIT_SIMULATOR="${SKIP_TEST_IOS_SIMULATOR}"
-                fi
-                test_this_target=$(not ${SKIP_TEST_IOS_32BIT_SIMULATOR})
-                ;;
-            appletvos-*)
-                swift_sdk="TVOS"
-                build_for_this_target=$(not ${SKIP_BUILD_TVOS_DEVICE})
-                if [[ ! "${SKIP_TEST_TVOS_HOST}" ]] ; then
-                    test_host_only=1
-                else
-                    test_this_target=
-                fi
-                build_benchmark_this_target=$(not ${SKIP_BUILD_TVOS_DEVICE})
-                build_external_benchmark_this_target=$(not ${SKIP_BUILD_TVOS_DEVICE})
-                ;;
-            appletvsimulator-*)
-                swift_sdk="TVOS_SIMULATOR"
-                build_for_this_target=$(not ${SKIP_BUILD_TVOS_SIMULATOR})
-                test_this_target=$(not ${SKIP_TEST_TVOS_SIMULATOR})
-                ;;
-            watchos-*)
-                swift_sdk="WATCHOS"
-                build_for_this_target=$(not ${SKIP_BUILD_WATCHOS_DEVICE})
-                if [[ ! "${SKIP_TEST_WATCHOS_HOST}" ]] ; then
-                    test_host_only=1
-                else
-                    test_this_target=
-                fi
-                build_benchmark_this_target=$(not ${SKIP_BUILD_WATCHOS_DEVICE})
-                build_external_benchmark_this_target=$(not ${SKIP_BUILD_WATCHOS_DEVICE})
-                ;;
-            watchsimulator-*)
-                swift_sdk="WATCHOS_SIMULATOR"
-                build_for_this_target=$(not ${SKIP_BUILD_WATCHOS_SIMULATOR})
-                test_this_target=$(not ${SKIP_TEST_WATCHOS_SIMULATOR})
-                ;;
-            android-*)
-                swift_sdk="ANDROID"
-                build_for_this_target=$(not ${SKIP_BUILD_ANDROID})
-                if [[ ! "${SKIP_TEST_ANDROID_HOST}" ]] ; then
-                    test_host_only=1
-                else
-                    test_this_target=$(not ${SKIP_TEST_ANDROID})
-                fi
-                ;;
-            *)
-                echo "Unknown compiler deployment target: ${stdlib_deployment_target}"
-                exit 1
-                ;;
-        esac
-
-        SWIFT_SDKS+=("${swift_sdk}")
-
-        if [[ "${build_for_this_target}" ]] && [[ "${is_in_build_list}" ]]; then
-
-            if [[ "${BUILD_SWIFT_STDLIB_UNITTEST_EXTRA}" == "1" ]] ; then
-                SWIFT_STDLIB_TARGETS+=("swift-stdlib-${stdlib_deployment_target}")
-            else
-                if [[ "${VALIDATION_TEST}" == "1" || "${LONG_TEST}" == "1" ]] ; then
-                    SWIFT_STDLIB_TARGETS+=("swift-stdlib-${stdlib_deployment_target}")
-                else
-                    SWIFT_STDLIB_TARGETS+=("swift-test-stdlib-${stdlib_deployment_target}")
-                fi
-            fi
-        fi
-        if [[ "${build_benchmark_this_target}" ]] && [[ "${is_in_build_list}" ]]; then
-            SWIFT_BENCHMARK_TARGETS+=("swift-benchmark-${stdlib_deployment_target}")
-            if [[ $(not ${SKIP_TEST_BENCHMARKS}) ]] ; then
-              SWIFT_RUN_BENCHMARK_TARGETS+=("check-swift-benchmark-${stdlib_deployment_target}")
-            fi
-        fi
-
-        if [[ "$(true_false ${SKIP_BUILD_EXTERNAL_BENCHMARKS})" == "FALSE"  ]] &&
-           [[ "${build_external_benchmark_this_target}" ]] &&
-           [[ "${is_in_build_list}" ]] ; then
-            SWIFT_BENCHMARK_TARGETS+=("swift-benchmark-${stdlib_deployment_target}-external")
-            if [[ $(not ${SKIP_TEST_BENCHMARKS}) ]] ; then
-                SWIFT_RUN_BENCHMARK_TARGETS+=("check-swift-benchmark-${stdlib_deployment_target}-external")
-            fi
-        fi
-
-        if [[ "${test_this_target}" ]] && [[ "${is_in_build_list}" ]]; then
-            test_target_suffix=""
-            if [[ -n "${test_host_only}" ]] ; then
-                test_target_suffix="-only_non_executable"
-            elif [[ -n "${ONLY_EXECUTABLE_TEST}" ]] ; then
-                test_target_suffix="-only_executable"
-            fi
-
-            test_subset_target_suffix=""
-            if [[ "${VALIDATION_TEST}" == "1" ]] ; then
-                if [[ "${LONG_TEST}" == "1" ]] ; then
-                    test_subset_target_suffix="-all"
-                else
-                    test_subset_target_suffix="-validation"
-                fi
-            else
-                if [[ "${LONG_TEST}" == "1" ]] ; then
-                    test_subset_target_suffix="-only_long"
-                fi
-            fi
-
-            SWIFT_TEST_TARGETS+=("check-swift${test_subset_target_suffix}${test_target_suffix}-${stdlib_deployment_target}")
-            if [[ $(not ${SKIP_TEST_OPTIMIZED}) && ! -n "${test_host_only}" ]] ; then
-                SWIFT_TEST_TARGETS+=("check-swift${test_subset_target_suffix}-optimize-${stdlib_deployment_target}")
-            fi
-            if [[ $(not ${SKIP_TEST_OPTIMIZE_FOR_SIZE}) && ! -n "${test_host_only}" ]] ; then
-                SWIFT_TEST_TARGETS+=("check-swift${test_subset_target_suffix}-optimize_size-${stdlib_deployment_target}")
-            fi
-            if [[ $(not ${SKIP_TEST_OPTIMIZE_NONE_WITH_IMPLICIT_DYNAMIC}) && ! -n "${test_host_only}" ]] ; then
-                SWIFT_TEST_TARGETS+=("check-swift${test_subset_target_suffix}-optimize_none_with_implicit_dynamic-${stdlib_deployment_target}")
-            fi
-        fi
-    done
-
-    # Filter duplicate SWIFT_SDKs
-    # We will get them if building for multiple architecture variants
-    SWIFT_SDKS=($(echo "${SWIFT_SDKS[@]}" | tr " " "\n" | sort -u | tr "\n" " "))
-
     # Get the values passed by `build-script`.
-    LEGACY_SWIFT_STDLIB_TARGETS=(${SWIFT_STDLIB_TARGETS[@]})
-    LEGACY_SWIFT_SDKS=(${SWIFT_SDKS[@]})
-    LEGACY_SWIFT_BENCHMARK_TARGETS=(${SWIFT_BENCHMARK_TARGETS[@]})
-    LEGACY_SWIFT_RUN_BENCHMARK_TARGETS=(${SWIFT_RUN_BENCHMARK_TARGETS[@]})
-    LEGACY_SWIFT_TEST_TARGETS=(${SWIFT_TEST_TARGETS[@]})
     SWIFT_STDLIB_TARGETS=($(get_host_specific_variable ${host} SWIFT_STDLIB_TARGETS))
     SWIFT_SDKS=($(get_host_specific_variable ${host} SWIFT_SDKS))
     SWIFT_BENCHMARK_TARGETS=($(get_host_specific_variable ${host} SWIFT_BENCHMARK_TARGETS))
     SWIFT_RUN_BENCHMARK_TARGETS=($(get_host_specific_variable ${host} SWIFT_RUN_BENCHMARK_TARGETS))
     SWIFT_TEST_TARGETS=($(get_host_specific_variable ${host} SWIFT_TEST_TARGETS))
-
-    # Validate the parameters match.
-    if [[ "${SWIFT_STDLIB_TARGETS[*]}" != "${LEGACY_SWIFT_STDLIB_TARGETS[*]}" ]]; then
-        printf "error: invalid build-script refactor for 'SWIFT_STDLIB_TARGETS': '%s' vs '%s'\n" "${SWIFT_STDLIB_TARGETS[*]}" "${LEGACY_SWIFT_STDLIB_TARGETS[*]}"
-        exit 1
-    fi
-    if [[ "${SWIFT_SDKS[*]}" != "${LEGACY_SWIFT_SDKS[*]}" ]]; then
-        printf "error: invalid build-script for 'SWIFT_SDKS' refactor: '%s' vs '%s'\n" "${SWIFT_SDKS[*]}" "${LEGACY_SWIFT_SDKS[*]}"
-        exit 1
-    fi
-    if [[ "${SWIFT_BENCHMARK_TARGETS[*]}" != "${LEGACY_SWIFT_BENCHMARK_TARGETS[*]}" ]]; then
-        printf "error: invalid build-script refactor for 'SWIFT_BENCHMARK_TARGETS': '%s' vs '%s'\n" "${SWIFT_BENCHMARK_TARGETS[*]}" "${LEGACY_SWIFT_BENCHMARK_TARGETS[*]}"
-        exit 1
-    fi
-    if [[ "${SWIFT_RUN_BENCHMARK_TARGETS[*]}" != "${LEGACY_SWIFT_RUN_BENCHMARK_TARGETS[*]}" ]]; then
-        printf "error: invalid build-script refactor for 'SWIFT_RUN_BENCHMARK_TARGETS': '%s' vs '%s'\n" "${SWIFT_RUN_BENCHMARK_TARGETS[*]}" "${LEGACY_SWIFT_RUN_BENCHMARK_TARGETS[*]}"
-        exit 1
-    fi
-    if [[ "${SWIFT_TEST_TARGETS[*]}" != "${LEGACY_SWIFT_TEST_TARGETS[*]}" ]]; then
-        printf "error: invalid build-script refactor for 'SWIFT_TEST_TARGETS': '%s' vs '%s'\n" "${SWIFT_TEST_TARGETS[*]}" "${LEGACY_SWIFT_TEST_TARGETS[*]}"
-        exit 1
-    fi
 }