Unreviewed, rolling out r116715.