Unreviewed, rolling out r234489.