Make instrumentation work again.