Merge "Reverting 26160443 to fix new bug (old bug no longer reproducible)."