Fix DB performance regression introduced in v1.59.0rc2.