Updated this to use a home-grown noop contextmanager.