Remove weird change from upstream. Looks wrong, too.