This is actually the exact intention. For mkl v11.1 (and probably more recent, impossible to tell right now), none of the stuff in that if body is required anymore...