As the issue evolved this week it finally became clear that the Prime Minister could not go to Te Tii Marae, but history may record that was the right decision, even if we don't sit comfortably with the reasons for it.
As we did after the Springbok tour turmoil - which everyone knew at the time would change this nation forever - we can now take time to ponder how we celebrate our national day.
Celebrate, as in how we celebrated winning the World Cup, or perhaps more pertinently back in 1995, the America's Cup, which despite the huge overtones of wealth and extravagant spending way beyond the dreams of most of us, we still seemed to celebrate, together.
As it happens, there've been some fine Waitangi Day commemorations in Hawke's Bay in recent years, driven, it is worth mentioning, by the iwi of the region - Ngati Kahungunu. Some points have been made in subtle ways, and politicians have been there. Importantly, on the day, they dressed in shorts and T-shirts like the rest of us.