I agree, we probably don't need this, I'll put a patch up there to turn it on in debug mode only.