Getting rid of this hacky monitor instrumentation.