Unreviewed, rolling out r121562.