Revert "Temporarily disable extra check for origin of connection"

This reverts commit 5df9d404881f683956e492c2c874b1f445e004d5.