Unreviewed, rolling out r205344.