Remove unnecessary thread variable
Merge commit '5b3d8b1c0462ea318c3550804da636ea40994415'