Revert "The fix for the Database API goes to Gerrit separately. Its filed"

This reverts commit 38b9563c31342c39f3fd427bdf8380eee78e6f2c.