follow-up I0065e259878; clean up return_to links

bug: 42369
Change-Id: If1afafefca78dc2b83f5fb8494d3cd5f57bf9f88