Re-apply changes manually so that github doesn't think the whole file is changed.

Re-apply changes manually so that github doesn't think the whole file is
changed.