Build fix for scaffold generator 

3-2 behaves different when scaffolding.

Fixes https://travis-ci.org/rails/rails/jobs/6898203#L617