fix tragic cpu hog and network bug

turns out we had this bug in production since 1.2.something.

this will definitely cause a merge conflict later on… yolo