'90210': Naomi gets an early wedding present as Max returns

With Naomi's (AnnaLynne McCord) wedding to P.J. (Nick Zano) just a couple weeks away, "90210" had to throw just a little wrinkle into the plan. And it appears they've found a way with the return of Max (Josh Zuckerman).

TV Guide is reporting that Max, the nerd love of Naomi's life, is slated to come back for the May 1 episode. The publication states that he's returning to the famous ZIP code to get married, and Naomi will find out that she's planning the event.

The unlikely pairing had exceptional chemistry in the latter half of last season. But things started to fall apart when there was a pregnancy scare. Then when Naomi started dating someone else, well, you can imagine the romance died pretty quickly.

But maybe absence makes the heart grow fonder?

So Zappers, who do you think Naomi will end up with?