Bug 2720: (follow-up) fix the "remove" links