finally put this patch into git, where it belong