The other changes use just "MODE-1934" in comments and annotations. If/when we want to revert this change, I suspect that we'll try to revert the commit, and if that fails then searching for "MODE-1934" will be sufficient. Can you replace these "//TODO author=..." statements with a simple "See MODE-1934" comment?