dump: Revert changes that caused regressions.