Rolling back changes to thread_queue to keep measurements consistent