remove manual gen add kludge
Merge remote-tracking branch 'upstream/oneman'