3222fce866
This reverts commit 8e4e9e7bf5bc5181b44aae16fb02507b58133ffa. This doesn't apply to this branch, only for single-pkgdb.