[PATCH 05/21] Properly set the logger