Revert "Leading into SPOT-2108. Potentially fixes logging issue."

This reverts commit bd5d3e319569cc0ad53090dd62cf7460b4059139.