Unreviewed, rolling out r106909.