Unreviewed, rolling out r130838.