This was supposed to be part of #9488, but I only now noticed it was lying around uncommitted in my git dir