Revert changed logging to fix crashes