Unreviewed, rolling out r142825.