Revert "Toolchain Changes"

This reverts commit d1cdbe2ad2c9003fd9427fbb29263b6e0d576fab.