gen-cmakefiles.py is mostly working
revert r9066