Unreviewed, rolling out r148851.