Unreviewed, rolling out r243346.