The broadcasting watchdog has also addressed the episode's drug references.
The soap could still be in hot water over the storyline though.
He'll be playing the ex-boyfriend of one of the village's residents.
'The renegotiation deal has become very fraught and is in jeopardy.'