restore correct scaffold generation
Merge pull request #11093 from nolman/restoring-scaffold-generation

restore correct scaffold generation