Adjust doEditLink() after changes in core

r74725 (yeah, seriously), I6a6c12a9, Id27555c6.

Change-Id: I7dbe5e9235b9d9ba35492a5a49a4f3793bc0e48e
Merge "Adjust doEditLink() after changes in core"