Unreviewed, rolling out r142337.