Revert, in another attempt to make they mystery deadlock go away.