Unreviewed, rolling out r202187.