Unreviewed, rolling out r187812.