Undo the changes for the Linux hang

I decided that the fix could be moved to the Palaso code without
causing problems.