Unreviewed, rolling out r221552.