Revert part of a930e53 which resulted in simple image/anchor selections not being handled by us.
Changelog entry.
Merge branch 't/10055'