Unreviewed, rolling out r252796.