Backports of text edits from #1925 (closed).
This will create a new commit in order to revert the existing changes.
