Comment 1 for bug 497355

If possible I'd prefer to avoid doing this in the 1.0 branch unless it can be shown the output will be the same, or equivalent. Not many expectations were placed on the old serializer, so this might be okay.