Revert last patch which causes tblgen to segfault (why, I'm not sure).