Close #12151, fixes #7091. I've done no regeneration, just guessed how to remove it by hand. Hopefully it's OK.