re-add some removed generators to simplify patch
3 files changed