Tweak for r29561: don't grab a database object until we need it