Reverted more logging changes