Again, this patch seems to be based on an earlier version of numpy or something...