This reverts commit d650c370. Mitigation for contacts having disappeared.
mentioned in commit cec8512b