Revert r36755 for the moment; various things use 'new Database'