Unreviewed, rolling out r164073 and r164080.