Revert "WFSystem: pached with 107 changes"