Unreviewed, rolling out r213259.