Undo [6a9ee3273c]. Last commit in Tk's core-8-5-branch makes this change no longer necessary.
merge-mark