This reverts commit 420adb01 because it causes crashes in large apps linking drcachesim statically. We believe that PR #4506 itself is actually correct and that it is simply revealing an underlying problem, and once we find that problem the plan is to re-instate it.
Issue: #4460 (closed)