This reverts commit 356acc82ad413dfec8d49745793e94a2e2f4c69e. Conflicts: * scripts/generate_errors.pl: a line adjacent to a changed line has independently changed in the meantime. Just revert the change done in the commit that's being reverted.