Revert "update in background thread"

This reverts commit 6739f1cbbf57d819164fcc1d6f4a24c57782fd8e.