Revert "Remove optional for attributes on input labels"

This reverts commit e5f456fcc7ea6257c602d58485672a056393f0ba.