Unreviewed, rolling out r154416.