#2704 - Removed hacky handling of error handler restore operations - restoring twice in the test instead
