Unreviewed, rolling out r121572.