Unreviewed, rolling out r243989.