Reverted custom metric service to aggregate values over time