Restore old output format of dump()