Revert "Updates for toolchain"

This reverts commit 95f35c8f75f2a690f31e9aba3614cc23638e6efc.