Revert r210342 and r210343, add test case for the crasher.
PR 20642.