Interestingly this has actually existed as a bug in XF 1.x probably since forever, and no one has ever brought it up. Additionally in XF1, although the content is restored, it presents an error message so we may well want to make a couple of changes there too.