Unbreak some rediculous global state nonsense