am 3ac8148c: Speed up database update

* commit '3ac8148cdc79bde4b009ccb6a9ffda77bdb547d3':
  Speed up database update