Revert the patch for issue 3835 because failed on Windows buildbot

Windows build is compiled with no-threaded tcl/tk by default