Issue 7936 by sgl: Restore logging