Haggai Revisited