You're right. I think I'd like to merge this fix and also the change to database_example - which I just pushed.

I'll put the sample back in database_example after enough of our configuration is ironed out and automated that it gets recorded in, as you say, requirements or suggested_requirements.