Mark this deprecated if we're no longer using these.