Properly work around CA-146164.

This is properly work around CA-146164.
Changing asynchronous call into synchronous call was not enough as some configuration still fails randomly. Hence Instead of simple call change, putting some guarded code to avoid CA-146164 bug.