Unreviewed, rolling out r197698.