Revert "fixing concurrent access bug, WIP"

This reverts commit 96e0dff9190d4abd5c395ffe424318e0d15cd503.