Return waf back. We really need it for legacy machines.