Revert r174026, "Remove Attribute::hasAttributes() and make Attribute::hasAttribute...