Links to the current page do not contain <ri> tags

I suspect that this issue is a result of the resolution of CONF-23328, which while absolutely correct in relation to #links to the current page is not quite right when linking to the current page.

If I create a comment which contains two links, one that links to the current page (in this case it was the Home page of the space) and another which links to a different page (note that both links contain a custom link body that retains the sense of where the links were originally pointing)

<p>
  <ac:link>
    <ac:plain-text-link-body>
      <![CDATA[This comment was originally created on the Home page of the TEST space.]]>
    </ac:plain-text-link-body>
  </ac:link>
</p>
<p>
  <ac:link>
    <ri:page ri:content-title="PIN test" />
    <ac:plain-text-link-body>
      <![CDATA[This link was originally pointing to the PIN Test page in the TEST space.]]>
    </ac:plain-text-link-body>
  </ac:link>
</p>

What's happening for me is that when I move a comment to a different page, then the first link points to the new 'current' page, when I would have expected it to remain pointing at the original Home page (the other link with the <ri> remains pointing at the page I selected)

It's possible that I can work around this by inserting the <ri> tags manually as I move the comment, however I suspect that this edge case is also affecting the {excerpt-include} macro, as can be seen by the following question on answers:

https://answers.atlassian.com/questions/15521/excerpt-include-macro-and-links-with-anchors

Ideally what I'd like to see is that if the link is to an anchor then the <ri> should be omitted, however if it has no anchor then the <ri> should be retained.