Revert part of r60927 which made invalid assumptions about the API offered by db modules.
Revert part of r60927 which made invalid assumptions about the API offered by db modules.

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator