This reverts commit 4603e94fe9. Making an exception go away is not a fix for something. :)
4603e94fe9