Revert "auto merge of #8645 : alexcrichton/rust/issue-6436-run-non-block...#8866