This reverts commit c15e9b68. The issue appears unrelated as the crash happened in the BOLTed binary, not instrumented binary.