Sarah Shahi is returning to Person of Interest for the show's upcoming fifth season, TVGuide.com has learned.

Shahi - whose character Shaw was shot in the middle of Season 4 but survived - has been on maternity leave since the end of last year. The L Word alum gave birth to twins, a boy and a girl, on March 1. Executive producer Greg Plageman told TVGuide.com that Shaw's return will be much more permanent than the type of quick check-ins the show did following the character's departure last season. "You will see her very early in the season, and once you see her, she will always be on the show for the remainder of the show," he said.

Fall TV Preview: Get scoop on your favorite returning shows

Although Shahi, who returns to work in September, doesn't yet know the specifics of how her character will be re-introduced, she is excited to give the fans more of Shaw — especially now that Team Machine is in such a dire situation. So, is she coming to save the day? "I hope so!" Shahi said. "Shaw had so much story left in her, that it felt like the right thing to do was come back."

At the Television Critics Association fall previews on Monday, CBS Entertainment Chairwoman Nina Tassler said it's still up in the air whether the shortened upcoming season will be the last for Person of Interest.

Are you looking forward to Shaw's return?

(Full disclosure: TVGuide.com is owned by CBS.)

VIDEO: Pretty Little Liars' Shay Mitchell had the best reaction to A's reveal