Add some instrumentation to try to find ENG-4667.