Yes, you're right, will be cleaned up in an upcoming PR. Have this as a global variable is wrong.