Revert "Toolchain fix is not needed anymore"

This reverts commit 11d8e2ac1a7f0b1b8be08176c968f734e14fdb14.