consistent link popping

Change-Id: Ie1f6c7f594f861ab93510a8750ce53282110da63