reverting the additions to use order fixer to move them into another fixer