Revert code changes from 06d9ea2

Turns out this seems to be a compiler bug. This particular bug was
caused by an exception that was allegedly not caught – even though the
exception was properly wrapped in a `try/catch` block.
Fix ChangeLog due to 15808c3
Merge branch 'exceptions-not-caught-on-64bit-win'