Unreviewed, rolling out r214973.