TS-1764 Fix the builds after this cleanup.