Fixing newrelic crash properly. Cherry-picking missed some things.