Revert "Check in a new toolchain fixing issue 2139334." This reverts commit e0ea05a29f6e673096867b44bb2e730be80fdd35. Please do not merge. As per Dr. No