Revert "TEST: new toolchain_build"

This reverts commit 49fc448bb3e88ec5deed13b8611e5213d2927f15.