This reverts commit 72794f8ff1. At least this provides a more useful stacktrace, if anyone wants to debug.
72794f8ff1