Revert commits to knockout made by EWOUT-QMINO\Ewout.
Merge pull request #2945 from Igorbek/knockout-revert

Revert commits to knockout made by EWOUT-QMINO\Ewout