Unreviewed, rolling out r152598.