The original commit seems to cause a regression in numba test. This reverts commit b1b4758e7f4b2ffe1faa28b00eb037832e5d26a7.