This reverts commit 129f6123fe. Saw hang during batch add with -threaded, so deferred for now.
129f6123fe