New behavior broke the AIX bot, so fall back to the old behavior on AIX for now to give time to investigate