Update to 2.3.9 and incorporate some feedback from landry@.
Not needed anymore.
Add comment and URL to review for patch.