Revert ZEN-3883 changes to fix error modeling AIX