Unreviewed, rolling out r152233.