Reverting a few temporary changes to worker files