Revert "Improved kcheck - done by mistake"

This reverts commit 5d2cee3eb213b919837c8e9c80103f9623d696d8, reversing
changes made to 5b61976a2769b82e0852c10bd0253e2e191e74b8.