Revert "remove distant safe checks (7620599)"

This reverts commit 21a15f3c2cc05bcd54abb6dfe5d1524c3de6aaf8.
remove contact checks (7772391)