0ca7a2e916
Retry applying this addendum. Previous commit added it w/ wrong log message so had to revert and then reapply here.