Reeastablish np 1.3 and py 2.6 compat