Unreviewed, rolling out r196837.