Merge "Revert "Fix sensitive logging""