Remove slow generate (for now).
Merge remote-tracking branch 'origin/master'