Reverting my thread changes to fix fanouts maybe