Revert "Merge pull request #8941 from borjasalguero/bug_thread_id_rebased"

This reverts commit f6a48343e3b5aaed19688ab50b90f1605a519365 because Bug 850127
got backed out from the b2g18_1_0_1 branch.