Reverted earlier change to AttributeNumber.