upgrade to 2.12.10 breakage

The upgrade to 2.12.10 didn't go as planned and resulted in a 'unfixable' state:

ncopa-desktop:~/Projects/abuild (master)$ doas apk upgrade -U -a
doas (ncopa@ncopa-desktop) password: 
fetch http://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/APKINDEX.tar.gz
fetch http://dl-master.alpinelinux.org/alpine/edge/main/x86_64/APKINDEX.tar.gz
fetch http://dl-master.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz
fetch http://dl-cdn.alpinelinux.org/alpine/edge/testing/x86_64/APKINDEX.tar.gz
Upgrading critical system libraries and apk-tools:
(1/1) Upgrading apk-tools (2.12.9-r3 -> 2.12.10-r0)
Executing busybox-1.35.0-r13.trigger
Continuing the upgrade transaction with new apk-tools:
ERROR: unable to select packages:
  cmd:kyua (virtual):
    note: please select one of the 'provided by' packages explicitly
    provided by: kyua
    required by: world[cmd:kyua]
  ninja (virtual):
    note: please select one of the 'provided by' packages explicitly
    provided by: samurai
    required by: world[ninja]
ncopa-desktop:~/Projects/abuild (master)$ doas apk del cmd:kyua
ERROR: unable to select packages:
  ninja (virtual):
    note: please select one of the 'provided by' packages explicitly
    provided by: samurai
    required by: world[ninja]
ncopa-desktop:~/Projects/abuild (master)$ doas apk del ninja
ERROR: unable to select packages:
  cmd:kyua (virtual):
    note: please select one of the 'provided by' packages explicitly
    provided by: kyua
    required by: world[cmd:kyua]
ncopa-desktop:~/Projects/abuild (master)$ doas apk del ninja cmd:kyua
ERROR: unable to select packages:
  Huh? Error reporter did not find the broken constraints.

I believe this was introduced by: 3b013f45

I suppose I can manually delete those from /etc/apk/world, but this seems a bit unfortunate for upgraders?