https://github.com/numba/numba/pull/9106 needs porting over to this repo - issue created so this doesn't get lost.