Unreviewed, rolling out r243843.