Lets punt this to a subsequent bug! I think this patch covers enough as it is.