Unreviewed, rolling out r142141.