Remove spurious optional attribute
Revert "Remove spurious optional attribute"

This reverts commit cb5c696868b450165873ede9740bfafa9818049a.
Remove spurious OPTIONAL attribute