Unreviewed, rolling out r165540.