...the special case for AIX can probably be cleaned up?

Change-Id: I34ca29acaddcff9b811067504c12a8243a6d046b