034fed3edc
also remove the code that adds a "return to XXX user" link that was supposed to be removed in MDL-23911 , otherwise the link would become visible after the bug fix (but not functional).