Revert "async -> sync". Fine tune async code

This reverts commit f0ee964230e232fcbb71852a73ae15bd5acb7411.