Revert "custom logging--do not merge"