lcg: revert temporary hwaf-worch hack (cd5571e)