Revert "Include both title and text attributes"

This reverts commit 631c06760190b7e207a8a16bb76517f7f308dc68.
Merge remote-tracking branch 'upstream/master'