Revert "[NUI] Fix tct fail issues (#2012)" (#2017)