The Wreath of Khan is a creation of Annie Shapiro’s, and yes, it features the original Khan played by Ricardo Montalban in what’s still considered to be one of the best (if not the best) Star Trek film.
Here’s the original, cheesetastic, so-eighties-it-hurts trailer for the 1982 film: