Revert to old AUIPC definition