Wow... Great continuity there. o_O I do hope they have an explanation for that in the movie (flashback, possibly?)... Confusion!
Not that I'm complaining about him being back, as Nabu is a fine character, in my opinion, but... they can't just undo something they've done. :/ (Like I said, they would definitely need an explanation for it.)