Unreviewed, rolling out r130656.