Do we want to keep this?  There are some other important edits in this PR.