Unreviewed, rolling out r243438.