Unreviewed, rolling out r219024.