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

This reverts commit 2f64311e0f23b85c29b20be9502cbdeaee8342ae because Bug 850127
was backed out of the b2g18 branch.