Revert d851a06.

It's better to have a hard to read error than to freeze without
realising it.