Changes made in https://github.com/patternfly/patternfly-react/pull/8273/files got reverted at some point in the v5 work, so it needs to be re-reverted again to align with discussion that was previously had in links mentioned in https://github.com/patternfly/patternfly-react/issues/8272