Revert 'Move power factor into motor rather than driver (1/2)'

That was not a good idea