Back out earlier fix.
Merge pull request #8202 from cro/fix-4410-again

Back out earlier fix.