Unreviewed, rolling out r157916.