More hacking on --disable-database-connectivity

Change-Id: Iefa6b104c60464e5a0d793bd676d8ea7ff2727c1