d3d0ca5fc6
This reverts commit 4b03017e8a.
Reason for revert: This blocks multithreaded callbacks
Change-Id: I9944417e4fb63c9eea2b286c828c7dfa621c4fe8