Revert "Merge branch '361444-comments-awards-focus-style-overflow' into 'master'"

This reverts merge request !86662 (merged)

This caused some weird wrapping issues when resolving discussions.