Unreviewed, rolling out r135973.