Revert some changes back, need to investigate more on threads