Restores the histogram NaN shim which is still required