Temporary revert to better diagnose internal error

This reverts commit cf944b305abab5c83a28a89d402970b2bfd0ae4a.