Reverted to 6fb0c0c1: Added ContactConnection back in