Revert "returning to improve user experience"

This reverts commit 063e9d83e80e2935bf14ea2db49e87bd5577f6ba.
improving user exp while keeping async