Merge "Revert "Turn on more logging to find this bug."" into jb-mr2-dev