Revert to 3520a04ac08faaea2a7fda123a7a2c20d6d2feaa. Toolchain and its scripts are a mess