Unreviewed, rolling out r215041.