Real fix for Infinite Unit Loop

Removed the temporal fix, which worked by picking up yields feeder service tried to hold on to (feeder service bug)