Unreviewed, rolling out r134442.