Reverted logging changes (STOX-31)