Redoing a change that was lost in the recent logging refactoring.