Revert a change that shouldn't have been committed as part of r7026.