Updating from New Relic's fork