Revert r183281, adds a comment about how to reproduce the hang.