Unreviewed, rolling out r240896.