Revert "upstream bookmark async fix"

This reverts commit 0496b3b10e1303381c744f76e494e663e0479487.

Fixes #383