Reverts 0ec05da0eea03849fc72bed84a2c7fe7be1de1b6 to bring back #14444 to fix #14348 (again)
Merge pull request #14673 from twbs/restore_sr_friendly_collapse

More screenreader friendly Collapse, Take 2