That’s the one.
Dennis Franz played 2 different regular characters on Hill Street Blues: the corrupt Detective Sal Benedetto in the 1982–83 season and, later, the main cast character Lieutenant Norman Buntz from 1985 to 1987.
Danny John Jules, who played Dwayne, left and returned as a guest, but then also did return for a full season, then left again.