Unreviewed, rolling out r100473.