Comment 4 for bug 1133526

I think the superficial change is necessary to meet the spec. In the interest of not producing more unexpected bugs, I think I'd vote for leaving the internals alone until we're open for Havana (db column, for example).