Unreviewed, rolling out r204464.