Since this is new code, we can just remove this rather than mark it deprecated.