Fixing line-break issues with r85922