Revert "bug: syndic does not return in 1 seconds"
Revert "bug: syndic does not return in 1 seconds"

This reverts commit 14fb6880543093dff77b9d41f6d16d43167be4bd.

Conflicts:
	salt/client/__init__.py

See my comments on PR#10336. That commit looked wrong to me and I got
no response to my query. It understandable that the change wouldn't have
caused much pain for most people but I suspect that commit 36601005 is
rendered unnecessary by reverting this.

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt