Revert exception handling change.