Merge "Revert "Temporary additional logging to investigate bug""