Revert "Trying to fix KAT"

This reverts commit 0876742b5ee275f93e6cbe010c1551c88e4aa3c2.