I commented this and following lines, because it does not belong in this patch, but if it is of interest...