Removing this patch for now, as I'm not considering using threads