Sigh.. If we have more relations, make sure we keep them all. See #2255