CAS-1418: Reverted change on logging aspect