[564265] Revert to old serializer/formatter
4 files changed