Rolled back use of affix.