Unreviewed, rolling out r243672.