Revert "SI-5824 Fix crashes in reify with _*"

This reverts commit 0a25ee3431d0314c782dd2e6620bc75c4de0d1a4.

It came with a test failure which I overlooked.
Merge pull request #1971 from paulp/pr/revert

Revert "SI-5824 Fix crashes in reify with _*"