Unreviewed, rolling out r117675.