Revert "Temporary revert to better diagnose internal error"

This reverts commit 14e77ad3a83213bb1ffbee6bcb31ab469e79b492.