Unreviewed, rolling out r189079.