This reverts recent changes, and simplifies the logging configuration
to work as expected. This hopefully now works correctly in all cases.