Attempting to re-add logging