Revert "remove further intelligence from endpoint setup (test fix for resurfacing of issue #2)."

This reverts commit d92a486d2f34c62d8fe0e42036690c074461ab29.