Unreviewed, rolling out r154989.