Revert "Update toolchain"

This reverts commit 38f24b61d190f9f847a5b59700c672f7e3f9543a.
Revert "Update to new toolchain path"

This reverts commit 0f3928b247a173396cc0f3df19f48f26dcc3a8aa.