Undo some of the reformatting in 43f2f27bfb008ed3983073e61309f28174d5dc0e so that it matches actual mysqldump output