Fix issue #884 (Scaffolding with --bare)

As reported yesterday in #884.