Unreviewed, rolling out r194328.