Unreviewed, rolling out r91082, r91087, and r91089.