This reverts commit 216501b4fa. Turn this back on since this was originally reverted for logging update changes.
216501b4fa