Revert commits to knockout made by EWOUT-QMINO\Ewout