If the line breaks as-is here are a big deal, feel free to cherry-pick the 2 commits in this PR that don't include the line breaks.