One more try at getting it to work for numpy 1.5