Unreviewed, rolling out r185906.