Unreviewed, rolling out r243008.