The storyline has been at the forefront of the show since 2007