diff --git a/test/testsupport/perf_test.cc b/test/testsupport/perf_test.cc
index e0a77ae46d..10b530aba4 100644
--- a/test/testsupport/perf_test.cc
+++ b/test/testsupport/perf_test.cc
@@ -46,7 +46,9 @@ class PerfResultsLogger {
                  const double value,
                  const std::string& units,
                  const bool important) {
-    RTC_CHECK(std::isfinite(value));
+    RTC_CHECK(std::isfinite(value))
+        << "Expected finite value for graph " << graph_name << ", trace name "
+        << trace_name << ", units " << units << ", got " << value;
 
     std::ostringstream value_stream;
     value_stream.precision(8);
diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc
index 1c1c402b5f..790b7b3074 100644
--- a/video/video_receive_stream.cc
+++ b/video/video_receive_stream.cc
@@ -375,7 +375,9 @@ void VideoReceiveStream::Start() {
   // |video_stream_decoder_|.
   call_stats_->RegisterStatsObserver(this);
 
-  process_thread_->RegisterModule(&video_receiver_, RTC_FROM_HERE);
+  // NOTE: *Not* registering video_receiver_ on process_thread_. Its Process
+  // method does nothing that is useful for us, since we no longer use the old
+  // jitter buffer.
 
   // Start the decode thread
   video_receiver_.DecoderThreadStarting();
@@ -393,7 +395,6 @@ void VideoReceiveStream::Stop() {
 
   frame_buffer_->Stop();
   call_stats_->DeregisterStatsObserver(this);
-  process_thread_->DeRegisterModule(&video_receiver_);
 
   if (decode_thread_.IsRunning()) {
     // TriggerDecoderShutdown will release any waiting decoder thread and make