Unreviewed, rolling out r243551.