[Numpy-discussion] Backport r5452?