[Rollback] Restored the previous nested metrics.