revert nkf elimination change