More reversion of r77297, 2 of 2 commits to keep it readable in CR (hopefully)